6 files changed, 17 insertions, 28 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
index 7d056a5..45080fb 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
@@ -45,6 +45,6 @@ public class EC_Curve extends EC_Params {
 
     @Override
     public String toString() {
-        return "Elliptic curve (" + String.valueOf(bits) + "b)" + (desc == null ? "" : ": " + desc);
+        return "<" + getId() + "> " + (field == KeyPair.ALG_EC_FP ? "Prime" : "Binary") + " field Elliptic curve (" + String.valueOf(bits) + "b)" + (desc == null ? "" : ": " + desc);
     }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/reader/ec/EC_Data.java
index 49b5316..5197665 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Data.java
@@ -158,14 +158,13 @@ public class EC_Data {
     }
 
     public void writeCSV(OutputStream out) throws IOException {
-        String[] hex = expand();
         Writer w = new OutputStreamWriter(out);
-        for (int i = 0; i < hex.length; ++i) {
-            w.write(hex[i]);
-            if (i < hex.length - 1) {
-                w.write(",");
-            }
-        }
+        w.write(String.join(",", expand()));
         w.flush();
     }
+
+    @Override
+    public String toString() {
+        return String.join(",", expand());
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
index 9e92fd9..28115f7 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
@@ -55,7 +55,7 @@ public class EC_KAResult extends EC_Data {
     @Override
     public String toString() {
         String algo = Util.getKA(ka);
-        return algo + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
+        return "<" + getId() + "> " + algo + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
     }
 
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Key.java b/src/cz/crcs/ectester/reader/ec/EC_Key.java
index 85fd652..cecd228 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Key.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Key.java
@@ -66,7 +66,7 @@ public class EC_Key extends EC_Params {
 
         @Override
         public String toString() {
-            return "EC Private key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
+            return "<" + getId() + "> EC Private key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
         }
     }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
index 4da7218..924906e 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
@@ -29,6 +29,6 @@ public class EC_Keypair extends EC_Params {
 
     @Override
     public String toString() {
-        return "EC Keypair, over " + curve + (desc == null ? "" : ": " + desc);
+        return "<" + getId() + "> EC Keypair, over " + curve + (desc == null ? "" : ": " + desc);
     }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Params.java b/src/cz/crcs/ectester/reader/ec/EC_Params.java
index cee9c16..7192b61 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Params.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Params.java
@@ -126,32 +126,22 @@ public class EC_Params extends EC_Data {
             short masked = (short) (params & paramMask);
             if (masked != 0) {
                 byte[] param = data[index];
-
                 if (masked == EC_Consts.PARAMETER_F2M) {
-                    //split into m, e1, e2, e3
                     for (int i = 0; i < 4; ++i) {
-                        out.add(String.format("%04x", Util.getShort(param, i * 2)));
+                        out.add(Util.bytesToHex(data[index + i], false));
                     }
-
+                    index += 4;
                 } else if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
-                    //split from X962 format into X and Y
-                    //disregard the first 04 and then split into half(uncompress)
-                    int half = (param.length - 1) / 2;
-                    out.add(Util.bytesToHex(param, 1, half, false));
-                    out.add(Util.bytesToHex(param, half + 1, half, false));
+                    out.add(Util.bytesToHex(param, false));
+                    out.add(Util.bytesToHex(data[index + 1], false));
+                    index += 2;
                 } else {
-                    //read raw
-                    out.add(Util.bytesToHex(data[index], false));
+                    out.add(Util.bytesToHex(param, false));
+                    index++;
                 }
-                index++;
             }
             paramMask = (short) (paramMask << 1);
         }
         return out.toArray(new String[out.size()]);
     }
-
-    @Override
-    public String toString() {
-        return String.join(",", expand());
-    }
 }