Reader: fixed ECDH and ECDSA output, also named curve testing

3 files changed, 26 insertions, 9 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index c4d29a5..86588df 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -602,6 +602,12 @@ public class ECTester {
             generate.add(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH));
         }
 
+        FileWriter out = null;
+        if (optOutput != null) {
+            out = new FileWriter(optOutput);
+            out.write("index;time;secret\n");
+        }
+
         int retry = 0;
         int done = 0;
         while (done < optECDHCount) {
@@ -621,13 +627,15 @@ public class ECTester {
                 }
             }
 
-            if (optOutput != null) {
-                FileWriter out = new FileWriter(optOutput);
-                out.write(Util.bytesToHex(perform.getSecret(), false));
-                out.close();
+            if (out != null) {
+                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, Util.bytesToHex(perform.getSecret(), false)));
             }
+
             ++done;
         }
+
+        if (out != null)
+            out.close();
     }
 
     /**
@@ -662,6 +670,12 @@ public class ECTester {
 
         systemOutLogger.println(Response.toString(prepare));
 
+        FileWriter out = null;
+        if (optOutput != null) {
+            out = new FileWriter(optOutput);
+            out.write("index;time;signature\n");
+        }
+
         int retry = 0;
         int done = 0;
         while (done < optECDSACount) {
@@ -682,13 +696,14 @@ public class ECTester {
                 }
             }
 
-            if (optOutput != null) {
-                FileWriter out = new FileWriter(optOutput);
-                out.write(Util.bytesToHex(perform.getSignature(), false));
-                out.close();
+            if (out != null) {
+                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, Util.bytesToHex(perform.getSignature(), false)));
             }
+
             ++done;
         }
+        if (out != null)
+            out.close();
     }
 
     /**
diff --git a/src/cz/crcs/ectester/reader/Response.java b/src/cz/crcs/ectester/reader/Response.java
index 28b6c17..e76d35c 100644
--- a/src/cz/crcs/ectester/reader/Response.java
+++ b/src/cz/crcs/ectester/reader/Response.java
@@ -129,7 +129,7 @@ public abstract class Response {
             } else {
                 suffix = String.format("%s %s", Util.getPrintError(r.getSW1()), Util.getPrintError(r.getSW2()));
             }
-            out.append(String.format("%-55s: %5d ms : %s", message, r.time/1000000, suffix));
+            out.append(String.format("%-55s:%5d ms : %s", message, r.time/1000000, suffix));
             if (i < responses.size() - 1) {
                 out.append("\n");
             }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
index 08a0b8a..273b1f4 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
@@ -20,6 +20,8 @@ public class EC_Curve extends EC_Params {
     public EC_Curve(short bits, byte field) {
         super(field == KeyPair.ALG_EC_FP ? EC_Consts.PARAMETERS_DOMAIN_FP : EC_Consts.PARAMETERS_DOMAIN_F2M);
         this.bits = bits;
+
+        this.field = field;
     }
 
     public EC_Curve(short bits, byte field, String desc) {