Fix some test-vector tests, also test printing

4 files changed, 19 insertions, 9 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 8afda17..9191b70 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -471,10 +471,7 @@ public class ECTester {
 
         List<Response> test = Command.sendAll(commands);
         if (suite != null) {
-            List<Test> tests = suite.run(cardManager);
-            for (Test t : tests) {
-                System.out.println(t);
-            }
+            suite.run(cardManager);
         }
         systemOutLogger.println(Response.toString(test, cfg.testSuite));
 
diff --git a/src/cz/crcs/ectester/reader/Response.java b/src/cz/crcs/ectester/reader/Response.java
index e5b8c1c..89dce9c 100644
--- a/src/cz/crcs/ectester/reader/Response.java
+++ b/src/cz/crcs/ectester/reader/Response.java
@@ -140,9 +140,7 @@ public abstract class Response {
                 out.append(prefix);
 
             String message = r.toString();
-            String full = r.toString(message);
-
-            out.append(full);
+            out.append(message);
             if (i < responses.size() - 1) {
                 out.append("\n");
             }
diff --git a/src/cz/crcs/ectester/reader/TestSuite.java b/src/cz/crcs/ectester/reader/TestSuite.java
index 892e853..56e0a4a 100644
--- a/src/cz/crcs/ectester/reader/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/TestSuite.java
@@ -63,6 +63,7 @@ public abstract class TestSuite {
     }
 
     public static class TestVectors extends TestSuite {
+
         public TestVectors(EC_Store dataStore, ECTester.Config cfg) {
             super(dataStore, cfg, "test");
         }
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;