Reworked invalid curve testing, added generated anomalous curves

4 files changed, 58 insertions, 12 deletions

diff --git a/src/cz/crcs/ectester/reader/TestSuite.java b/src/cz/crcs/ectester/reader/TestSuite.java
index c2ccb54..e4d7dd6 100644
--- a/src/cz/crcs/ectester/reader/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/TestSuite.java
@@ -8,10 +8,7 @@ import javacard.security.KeyPair;
 
 import javax.smartcardio.CardException;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -250,6 +247,7 @@ public abstract class TestSuite {
              * Try ECDH with invalid public keys of increasing (or decreasing) order.
              */
             Map<String, EC_Key.Public> pubkeys = dataStore.getObjects(EC_Key.Public.class, "invalid");
+            Map<EC_Curve, List<EC_Key.Public>> curves = new HashMap<>();
             for (EC_Key.Public key : pubkeys.values()) {
                 EC_Curve curve = dataStore.getObject(EC_Curve.class, key.getCurve());
                 if (cfg.namedCurve != null && !(key.getCurve().startsWith(cfg.namedCurve) || key.getCurve().equals(cfg.namedCurve))) {
@@ -258,13 +256,24 @@ public abstract class TestSuite {
                 if (curve.getBits() != cfg.bits && !cfg.all) {
                     continue;
                 }
+                List<EC_Key.Public> keys = curves.getOrDefault(curve, new LinkedList<>());
+                keys.add(key);
+                curves.putIfAbsent(curve, keys);
+            }
+            for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curves.entrySet()) {
+                EC_Curve curve = e.getKey();
+                List<EC_Key.Public> keys = e.getValue();
+
                 tests.add(new Test(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), Test.Result.SUCCESS));
                 tests.add(new Test(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), Test.Result.SUCCESS));
                 tests.add(new Test(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL), Test.Result.SUCCESS));
-                tests.add(new Test(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, key.getParams(), key.flatten()), Test.Result.ANY));
-                tests.add(new Test(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE, EC_Consts.KA_BOTH), Test.Result.FAILURE));
+                for (EC_Key.Public pub : keys) {
+                    tests.add(new Test(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, pub.getParams(), pub.flatten()), Test.Result.ANY));
+                    tests.add(new Test(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE, EC_Consts.KA_BOTH), Test.Result.FAILURE));
+                }
                 tests.add(new Test(new Command.Cleanup(cardManager), Test.Result.ANY));
             }
+
             return super.run(cardManager);
         }
     }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Category.java b/src/cz/crcs/ectester/reader/ec/EC_Category.java
index a0c8755..97dd1b4 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Category.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Category.java
@@ -2,6 +2,7 @@ package cz.crcs.ectester.reader.ec;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -125,4 +126,15 @@ public class EC_Category {
         }
         return out.toString();
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EC_Category && Objects.equals(this.name, ((EC_Category) obj).name);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.name.hashCode() ^ this.directory.hashCode();
+    }
+
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/reader/ec/EC_Data.java
index 5197665..9dcbbe0 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Data.java
@@ -3,16 +3,13 @@ package cz.crcs.ectester.reader.ec;
 import cz.crcs.ectester.reader.Util;
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Scanner;
+import java.util.*;
 import java.util.regex.Pattern;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class EC_Data {
+public abstract class EC_Data {
     String id;
     int count;
     byte[][] data;
@@ -167,4 +164,33 @@ public class EC_Data {
     public String toString() {
         return String.join(",", expand());
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EC_Data) {
+            EC_Data other = (EC_Data) obj;
+            if (this.id != null || other.id != null) {
+                return Objects.equals(this.id, other.id);
+            }
+
+            if (this.count != other.count)
+                return false;
+            for (int i = 0; i < this.count; ++i) {
+                if (!Arrays.equals(this.data[i], other.data[i])) {
+                    return false;
+                }
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        if (this.id != null) {
+            return this.id.hashCode();
+        }
+        return Arrays.deepHashCode(this.data);
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Params.java b/src/cz/crcs/ectester/reader/ec/EC_Params.java
index 7192b61..ea2e633 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Params.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Params.java
@@ -4,7 +4,6 @@ import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.reader.Util;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;