Merge branch 'devel'

2 files changed, 38 insertions, 23 deletions

diff --git a/src/cz/crcs/ectester/common/ec/EC_Category.java b/src/cz/crcs/ectester/common/ec/EC_Category.java
index 1eb818f..154403e 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Category.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Category.java
@@ -2,10 +2,8 @@ package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.common.cli.Colors;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.TreeMap;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * A category of EC_Data objects, has a name, description and represents a directory in
@@ -78,28 +76,17 @@ public class EC_Category {
         out.append("\t- ").append(Colors.bold(name)).append((desc == null || desc.equals("")) ? "" : ": " + desc);
         out.append(System.lineSeparator());
 
-        Map<String, EC_Curve> curves = getObjects(EC_Curve.class);
-        int size = curves.size();
-        if (size > 0) {
-            out.append(Colors.bold("\t\tCurves: "));
-            for (Map.Entry<String, EC_Curve> curve : curves.entrySet()) {
-                out.append(curve.getKey());
-                size--;
-                if (size > 0)
-                    out.append(", ");
-            }
-            out.append(System.lineSeparator());
-        }
-
-        String[] headers = new String[]{"Public keys", "Private keys", "KeyPairs", "Results(KA)", "Results(SIG)"};
-        Class<EC_Data>[] classes = new Class[]{EC_Key.Public.class, EC_Key.Private.class, EC_Keypair.class, EC_KAResult.class, EC_SigResult.class};
+        String[] headers = new String[]{"Curves", "Public keys", "Private keys", "KeyPairs", "Results(KA)", "Results(SIG)"};
+        Class<EC_Data>[] classes = new Class[]{EC_Curve.class, EC_Key.Public.class, EC_Key.Private.class, EC_Keypair.class, EC_KAResult.class, EC_SigResult.class};
         for (int i = 0; i < headers.length; ++i) {
             Map<String, EC_Data> data = getObjects(classes[i]);
-            size = data.size();
+            int size = data.size();
             if (size > 0) {
                 out.append(Colors.bold(String.format("\t\t%s: ", headers[i])));
-                for (Map.Entry<String, EC_Data> key : data.entrySet()) {
-                    out.append(key.getKey());
+                List<EC_Data> sorted = new ArrayList<>(data.values());
+                Collections.sort(sorted);
+                for (EC_Data element : sorted) {
+                    out.append(element.getId());
                     size--;
                     if (size > 0)
                         out.append(", ");
diff --git a/src/cz/crcs/ectester/common/ec/EC_Curve.java b/src/cz/crcs/ectester/common/ec/EC_Curve.java
index 6c0d060..d5d1516 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Curve.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Curve.java
@@ -3,6 +3,7 @@ package cz.crcs.ectester.common.ec;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.util.ByteUtil;
 import javacard.security.KeyPair;
+import org.bouncycastle.math.ec.ECCurve;
 
 import java.math.BigInteger;
 import java.security.spec.*;
@@ -64,7 +65,12 @@ public class EC_Curve extends EC_Params {
             int e1 = ByteUtil.getShort(fieldData[1], 0);
             int e2 = ByteUtil.getShort(fieldData[2], 0);
             int e3 = ByteUtil.getShort(fieldData[3], 0);
-            int[] powers = new int[]{e1, e2, e3};
+            int[] powers;
+            if (e2 == 0 && e3 == 0) {
+                powers = new int[]{e1};
+            } else {
+                powers = new int[]{e1, e2, e3};
+            }
             field = new ECFieldF2m(m, powers);
         }
 
@@ -74,6 +80,28 @@ public class EC_Curve extends EC_Params {
         return new EllipticCurve(field, a, b);
     }
 
+    public ECCurve toBCCurve() {
+        if (this.field == KeyPair.ALG_EC_FP) {
+            BigInteger p = new BigInteger(1, getParam(EC_Consts.PARAMETER_FP)[0]);
+            BigInteger a = new BigInteger(1, getParam(EC_Consts.PARAMETER_A)[0]);
+            BigInteger b = new BigInteger(1, getParam(EC_Consts.PARAMETER_B)[0]);
+            BigInteger r = new BigInteger(1, getParam(EC_Consts.PARAMETER_R)[0]);
+            BigInteger k = new BigInteger(1, getParam(EC_Consts.PARAMETER_K)[0]);
+            return new ECCurve.Fp(p, a, b, r, k);
+        } else {
+            byte[][] fieldData = getParam(EC_Consts.PARAMETER_F2M);
+            int m = ByteUtil.getShort(fieldData[0], 0);
+            int e1 = ByteUtil.getShort(fieldData[1], 0);
+            int e2 = ByteUtil.getShort(fieldData[2], 0);
+            int e3 = ByteUtil.getShort(fieldData[3], 0);
+            BigInteger a = new BigInteger(1, getParam(EC_Consts.PARAMETER_A)[0]);
+            BigInteger b = new BigInteger(1, getParam(EC_Consts.PARAMETER_B)[0]);
+            BigInteger r = new BigInteger(1, getParam(EC_Consts.PARAMETER_R)[0]);
+            BigInteger k = new BigInteger(1, getParam(EC_Consts.PARAMETER_K)[0]);
+            return new ECCurve.F2m(m, e1, e2, e3, a, b, r, k);
+        }
+    }
+
     public ECParameterSpec toSpec() {
         EllipticCurve curve = toCurve();