4 files changed, 18 insertions, 10 deletions

diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index 94eb011..9b1f5bb 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -266,11 +266,11 @@ public class EC_Store {
 
         EC_Params result;
         if (elem.getTagName().equals("pubkey")) {
-            result = new EC_Key.Public(curve.getTextContent(), descs);
+            result = new EC_Key.Public(id.getTextContent(), curve.getTextContent(), descs);
         } else if (elem.getTagName().equals("privkey")) {
-            result = new EC_Key.Private(curve.getTextContent(), descs);
+            result = new EC_Key.Private(id.getTextContent(), curve.getTextContent(), descs);
         } else if (elem.getTagName().equals("keypair")) {
-            result = new EC_Keypair(curve.getTextContent(), descs);
+            result = new EC_Keypair(id.getTextContent(), curve.getTextContent(), descs);
         } else {
             throw new SAXException("?");
         }
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index aff5762..ea2cbe4 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -615,7 +615,7 @@ public class ECTester {
         public boolean simulate = false;
         public boolean yes = false;
 
-        //Action-related ions
+        //Action-related options
         public String listNamed;
         public String testSuite;
         public int generateAmount;
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Key.java b/src/cz/crcs/ectester/reader/ec/EC_Key.java
index e1adcf1..5077d5b 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Key.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Key.java
@@ -22,11 +22,6 @@ public class EC_Key extends EC_Params {
         this.desc = desc;
     }
 
-    private EC_Key(String id, short mask, String curve) {
-        this(mask, curve);
-        this.id = id;
-    }
-
     private EC_Key(String id, short mask, String curve, String desc) {
         this(mask, curve, desc);
         this.id = id;
@@ -53,9 +48,13 @@ public class EC_Key extends EC_Params {
             super(EC_Consts.PARAMETER_W, curve, desc);
         }
 
+        public Public(String id, String curve, String desc) {
+            super(id, EC_Consts.PARAMETER_W, curve, desc);
+        }
+
         @Override
         public String toString() {
-            return "EC Public key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
+            return "<" + getId() + "> EC Public key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
         }
     }
 
@@ -72,6 +71,10 @@ public class EC_Key extends EC_Params {
             super(EC_Consts.PARAMETER_S, curve, desc);
         }
 
+        public Private(String id, String curve, String desc) {
+            super(id, EC_Consts.PARAMETER_S, curve, desc);
+        }
+
         @Override
         public String toString() {
             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 e7da027..2643346 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
@@ -21,6 +21,11 @@ public class EC_Keypair extends EC_Params {
         this.desc = desc;
     }
 
+    public EC_Keypair(String id, String curve, String desc) {
+        this(curve, desc);
+        this.id = id;
+    }
+
     public String getCurve() {
         return curve;
     }