Some docs, allow EC_* objects to print themselves.

5 files changed, 29 insertions, 2 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
index 273b1f4..953884f 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
@@ -40,4 +40,9 @@ public class EC_Curve extends EC_Params {
     public String getDesc() {
         return desc;
     }
+
+    @Override
+    public String toString() {
+        return "Elliptic curve (" + String.valueOf(bits) + "b): " + desc;
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/reader/ec/EC_Data.java
index 2e1eb29..c55b99d 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Data.java
@@ -21,12 +21,12 @@ public class EC_Data {
     EC_Data() {
     }
 
-    public EC_Data(int count) {
+    EC_Data(int count) {
         this.count = count;
         this.data = new byte[count][];
     }
 
-    public EC_Data(byte[][] data) {
+    EC_Data(byte[][] data) {
         this.count = data.length;
         this.data = data;
     }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
index e556f90..f1be49a 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
@@ -1,5 +1,7 @@
 package cz.crcs.ectester.reader.ec;
 
+import cz.crcs.ectester.applet.EC_Consts;
+
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
@@ -45,4 +47,10 @@ public class EC_KAResult extends EC_Data {
         return desc;
     }
 
+    @Override
+    public String toString() {
+        String agreement = ka == EC_Consts.KA_ECDH ? "ECDH" : "ECDHC";
+        return agreement + " over " + curve + ", " + oneKey + " + " + otherKey + ": " + desc;
+    }
+
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Key.java b/src/cz/crcs/ectester/reader/ec/EC_Key.java
index b78aaee..983ffa8 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Key.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Key.java
@@ -37,6 +37,11 @@ public class EC_Key extends EC_Params {
         public Public(String curve, String desc) {
             super(EC_Consts.PARAMETER_W, curve, desc);
         }
+
+        @Override
+        public String toString() {
+            return "EC Public key, over " + getCurve() + ": " + getDesc();
+        }
     }
 
     public static class Private extends EC_Key {
@@ -49,5 +54,9 @@ public class EC_Key extends EC_Params {
             super(EC_Consts.PARAMETER_S, curve, desc);
         }
 
+        @Override
+        public String toString() {
+            return "EC Private key, over " + getCurve() + ": " + getDesc();
+        }
     }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
index 0ee3801..af4038a 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
@@ -27,4 +27,9 @@ public class EC_Keypair extends EC_Params {
     public String getDesc() {
         return desc;
     }
+
+    @Override
+    public String toString() {
+        return "EC Keypair, over " + curve + ": " + desc;
+    }
 }