From 3aaead661e2b23b5e5811a3a06daed61db638a72 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Wed, 19 Apr 2017 21:56:39 +0200
Subject: Fix some test-vector tests, also test printing

---
 src/cz/crcs/ectester/reader/Util.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/cz/crcs/ectester/reader/Util.java')

diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/reader/Util.java
index 3a6a8ae..6fe3b8e 100644
--- a/src/cz/crcs/ectester/reader/Util.java
+++ b/src/cz/crcs/ectester/reader/Util.java
@@ -157,6 +157,9 @@ public class Util {
             case ECTesterApplet.SW_SIG_VERIFY_FAIL:
             case ECTesterApplet.SW_DH_DHC_MISMATCH:
             case ECTesterApplet.SW_KEYPAIR_NULL:
+            case ECTesterApplet.SW_KA_NULL:
+            case ECTesterApplet.SW_SIGNATURE_NULL:
+            case ECTesterApplet.SW_OBJECT_NULL:
                 return "ECTesterApplet";
             default:
                 return "?";
@@ -259,6 +262,15 @@ public class Util {
                 case ECTesterApplet.SW_KEYPAIR_NULL:
                     str = "KEYPAIR_NULL";
                     break;
+                case ECTesterApplet.SW_KA_NULL:
+                    str = "KA_NULL";
+                    break;
+                case ECTesterApplet.SW_SIGNATURE_NULL:
+                    str = "SIGNATURE_NULL";
+                    break;
+                case ECTesterApplet.SW_OBJECT_NULL:
+                    str = "OBJECT_NULL";
+                    break;
                 default:
                     str = "unknown";
                     break;
@@ -303,13 +315,15 @@ public class Util {
 
     public static String getKA(byte ka) {
         String algo = "";
-        if ((ka & EC_Consts.KA_ECDH) != 0) {
+        if ((ka & EC_Consts.KA_ECDH) != 0 || ka == EC_Consts.KA_ANY) {
             algo += "ECDH";
         }
         if (ka == EC_Consts.KA_BOTH) {
             algo += "+";
+        } else if (ka == EC_Consts.KA_ANY) {
+            algo += "/";
         }
-        if ((ka & EC_Consts.KA_ECDHC) != 0) {
+        if ((ka & EC_Consts.KA_ECDHC) != 0 || ka == EC_Consts.KA_ANY) {
             algo += "ECDHC";
         }
         return algo;
-- 
cgit v1.2.3-70-g09d2