Created a new command: Corrupt

Originaly a part of a set command, now allows more control
of keypairs

4 files changed, 131 insertions, 29 deletions

diff --git a/src/cz/crcs/ectester/reader/Command.java b/src/cz/crcs/ectester/reader/Command.java
index c6ce2b5..cb2321a 100644
--- a/src/cz/crcs/ectester/reader/Command.java
+++ b/src/cz/crcs/ectester/reader/Command.java
@@ -75,6 +75,10 @@ public abstract class Command {
     public static class Clear extends Command {
         private byte keyPair;
 
+        /**
+         * @param cardManager
+         * @param keyPair     which keyPair clear, local/remote (KEYPAIR_* || ...)
+         */
         public Clear(CardMngr cardManager, byte keyPair) {
             super(cardManager);
             this.keyPair = keyPair;
@@ -98,8 +102,6 @@ public abstract class Command {
         private byte keyPair;
         private byte curve;
         private short params;
-        private short corrupted;
-        private byte corruption;
         private byte[] external;
 
         /**
@@ -109,26 +111,20 @@ public abstract class Command {
          * @param keyPair     which keyPair to set params on, local/remote (KEYPAIR_* || ...)
          * @param curve       curve to set (EC_Consts.CURVE_*)
          * @param params      parameters to set (EC_Consts.PARAMETER_* | ...)
-         * @param corrupted   parameters to corrupt (EC_Consts.PARAMETER_* | ...)
-         * @param corruption  corruption type (EC_Consts.CORRUPTION_*)
          * @param external    external curve data, can be null
          */
-        public Set(CardMngr cardManager, byte keyPair, byte curve, short params, short corrupted, byte corruption, byte[] external) {
+        public Set(CardMngr cardManager, byte keyPair, byte curve, short params, byte[] external) {
             super(cardManager);
             this.keyPair = keyPair;
             this.curve = curve;
             this.params = params;
-            this.corrupted = corrupted;
-            this.corruption = corruption;
             this.external = external;
 
-            int len = external != null ? 5 + 2 + external.length : 5;
+            int len = external != null ? 2 + external.length : 2;
             byte[] data = new byte[len];
             Util.setShort(data, 0, params);
-            Util.setShort(data, 2, corrupted);
-            data[4] = corruption;
             if (external != null) {
-                System.arraycopy(external, 0, data, 5, external.length);
+                System.arraycopy(external, 0, data, 2, external.length);
             }
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_SET, keyPair, curve, data);
@@ -139,7 +135,46 @@ public abstract class Command {
             long elapsed = -System.nanoTime();
             ResponseAPDU response = cardManager.send(cmd);
             elapsed += System.nanoTime();
-            return new Response.Set(response, elapsed, keyPair, curve, params, corrupted);
+            return new Response.Set(response, elapsed, keyPair, curve, params);
+        }
+    }
+
+    /**
+     *
+     */
+    public static class Corrupt extends Command {
+        private byte keyPair;
+        private byte key;
+        private short params;
+        private byte corruption;
+
+        /**
+         * @param cardManager
+         * @param keyPair     which keyPair to corrupt, local/remote (KEYPAIR_* || ...)
+         * @param key
+         * @param params      parameters to corrupt (EC_Consts.PARAMETER_* | ...)
+         * @param corruption  corruption type (EC_Consts.CORRUPTION_*)
+         */
+        protected Corrupt(CardMngr cardManager, byte keyPair, byte key, short params, byte corruption) {
+            super(cardManager);
+            this.keyPair = keyPair;
+            this.key = key;
+            this.params = params;
+            this.corruption = corruption;
+
+            byte[] data = new byte[3];
+            Util.setShort(data, 0, params);
+            data[2] = corruption;
+
+            this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_CORRUPT, keyPair, key, data);
+        }
+
+        @Override
+        public Response.Corrupt send() throws CardException {
+            long elapsed = -System.nanoTime();
+            ResponseAPDU response = cardManager.send(cmd);
+            elapsed += System.nanoTime();
+            return new Response.Corrupt(response, elapsed, keyPair, key, params, corruption);
         }
     }
 
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 86588df..35982d7 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -233,14 +233,14 @@ public class ECTester {
         opts.addOptionGroup(actions);
 
         OptionGroup size = new OptionGroup();
-        size.addOption(Option.builder("b").longOpt("bit-size").desc("Set curve size.").hasArg().argName("b").build());
+        size.addOption(Option.builder("b").longOpt("bit-size").desc("Set curve size.").hasArg().argName("bits").build());
         size.addOption(Option.builder("a").longOpt("all").desc("Test all curve sizes.").build());
         opts.addOptionGroup(size);
 
         OptionGroup curve = new OptionGroup();
         curve.addOption(Option.builder("n").longOpt("named").desc("Use a named curve.").hasArg().argName("cat/id").build());
         curve.addOption(Option.builder("c").longOpt("curve").desc("Use curve from file [curve_file] (field,a,b,gx,gy,r,k).").hasArg().argName("curve_file").build());
-        curve.addOption(Option.builder("u").longOpt("custom").desc("Use a custom curve(applet-side embedded, SECG curves).").build());
+        curve.addOption(Option.builder("u").longOpt("custom").desc("Use a custom curve(applet-side embedded, SECG curvgites).").build());
         opts.addOptionGroup(curve);
 
         opts.addOption(Option.builder("fp").longOpt("prime-field").desc("Use prime field curve.").build());
@@ -257,7 +257,7 @@ public class ECTester {
         opts.addOptionGroup(priv);
 
         OptionGroup key = new OptionGroup();
-        key.addOption(Option.builder("nk").longOpt("named-key").desc("Use keyPair from KeyDB: [cat/id|id|cat]").hasArg().argName("[cat/id|id|cat]").build());
+        key.addOption(Option.builder("nk").longOpt("named-key").desc("Use keyPair from KeyDB: [cat/id]").hasArg().argName("cat/id").build());
         key.addOption(Option.builder("k").longOpt("key").desc("Use keyPair from file [key_file] (wx,wy,s).").hasArg().argName("key_file").build());
         opts.addOptionGroup(key);
 
@@ -529,7 +529,7 @@ public class ECTester {
                         if (curve.getField() == KeyPair.ALG_EC_FP) {
                             commands.add(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), KeyPair.ALG_EC_FP));
                             byte[] external = curve.flatten();
-                            commands.add(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, external));
+                            commands.add(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), external));
                             commands.addAll(testCurve());
                         }
                     }
@@ -540,7 +540,7 @@ public class ECTester {
                         if (curve.getField() == KeyPair.ALG_EC_F2M) {
                             commands.add(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), KeyPair.ALG_EC_F2M));
                             byte[] external = curve.flatten();
-                            commands.add(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, external));
+                            commands.add(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), external));
                             commands.addAll(testCurve());
                         }
                     }
@@ -719,7 +719,7 @@ public class ECTester {
         short domainParams = keyClass == KeyPair.ALG_EC_FP ? EC_Consts.PARAMETERS_DOMAIN_FP : EC_Consts.PARAMETERS_DOMAIN_F2M;
         if (optCustomCurve) {
             // Set custom curve (one of the SECG curves embedded applet-side)
-            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.getCurve(keyLength, keyClass), domainParams, EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, null));
+            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.getCurve(keyLength, keyClass), domainParams, null));
         } else if (optNamedCurve != null) {
             // Set a named curve.
             // parse optNamedCurve -> cat / id | cat | id
@@ -735,7 +735,7 @@ public class ECTester {
             if (external == null) {
                 throw new IOException("Couldn't read named curve data.");
             }
-            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, domainParams, EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, external));
+            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, domainParams, external));
         } else if (optCurveFile != null) {
             // Set curve loaded from a file
             EC_Params params = new EC_Params(domainParams);
@@ -748,7 +748,7 @@ public class ECTester {
             if (external == null) {
                 throw new IOException("Couldn't read the curve file correctly.");
             }
-            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, domainParams, EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, external));
+            commands.add(new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, domainParams, external));
         } else {
             // Set default curve
             commands.add(new Command.Clear(cardManager, keyPair));
@@ -823,7 +823,7 @@ public class ECTester {
             }
             data = Util.concatenate(data, privkey);
         }
-        return new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, params, EC_Consts.PARAMETERS_NONE, EC_Consts.CORRUPTION_NONE, data);
+        return new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, params, data);
     }
 
     /**
diff --git a/src/cz/crcs/ectester/reader/Response.java b/src/cz/crcs/ectester/reader/Response.java
index e76d35c..25b5817 100644
--- a/src/cz/crcs/ectester/reader/Response.java
+++ b/src/cz/crcs/ectester/reader/Response.java
@@ -129,7 +129,7 @@ public abstract class Response {
             } else {
                 suffix = String.format("%s %s", Util.getPrintError(r.getSW1()), Util.getPrintError(r.getSW2()));
             }
-            out.append(String.format("%-55s:%5d ms : %s", message, r.time/1000000, suffix));
+            out.append(String.format("%-55s:%5d ms : %s", message, r.time / 1000000, suffix));
             if (i < responses.size() - 1) {
                 out.append("\n");
             }
@@ -202,14 +202,12 @@ public abstract class Response {
         private byte keyPair;
         private byte curve;
         private short parameters;
-        private short corrupted;
 
-        protected Set(ResponseAPDU response, long time, byte keyPair, byte curve, short parameters, short corrupted) {
+        protected Set(ResponseAPDU response, long time, byte keyPair, byte curve, short parameters) {
             super(response, time);
             this.keyPair = keyPair;
             this.curve = curve;
             this.parameters = parameters;
-            this.corrupted = corrupted;
 
             int pairs = 0;
             if ((keyPair & ECTesterApplet.KEYPAIR_LOCAL) != 0) pairs++;
@@ -232,13 +230,13 @@ public abstract class Response {
                     name = "custom";
                     break;
             }
-            String key;
+            String pair;
             if (keyPair == ECTesterApplet.KEYPAIR_BOTH) {
-                key = "both keypairs";
+                pair = "both keypairs";
             } else {
-                key = ((keyPair == ECTesterApplet.KEYPAIR_LOCAL) ? "local" : "remote") + " keypair";
+                pair = ((keyPair == ECTesterApplet.KEYPAIR_LOCAL) ? "local" : "remote") + " keypair";
             }
-            return String.format("Set %s curve parameters on %s", name, key);
+            return String.format("Set %s curve parameters on %s", name, pair);
         }
 
     }
@@ -246,6 +244,43 @@ public abstract class Response {
     /**
      *
      */
+    public static class Corrupt extends Response {
+        private byte keyPair;
+        private byte key;
+        private short params;
+        private byte corruption;
+
+        protected Corrupt(ResponseAPDU response, long time, byte keyPair, byte key, short params, byte corruption) {
+            super(response, time);
+            this.keyPair = keyPair;
+            this.key = key;
+            this.params = params;
+            this.corruption = corruption;
+
+            int pairs = 0;
+            if ((keyPair & ECTesterApplet.KEYPAIR_LOCAL) != 0) pairs++;
+            if ((keyPair & ECTesterApplet.KEYPAIR_REMOTE) != 0) pairs++;
+
+            parse(pairs, 0);
+        }
+
+        @Override
+        public String toString() {
+            String corrupt = Util.getCorruption(corruption);
+
+            String pair;
+            if (keyPair == ECTesterApplet.KEYPAIR_BOTH) {
+                pair = "both keypairs";
+            } else {
+                pair = ((keyPair == ECTesterApplet.KEYPAIR_LOCAL) ? "local" : "remote") + " keypair";
+            }
+            return String.format("Corrupted params of %s, %s", pair, corrupt);
+        }
+    }
+
+    /**
+     *
+     */
     public static class Generate extends Response {
         private byte keyPair;
 
diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/reader/Util.java
index e297ab1..91a34d7 100644
--- a/src/cz/crcs/ectester/reader/Util.java
+++ b/src/cz/crcs/ectester/reader/Util.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.reader;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
+import cz.crcs.ectester.applet.EC_Consts;
 import javacard.framework.ISO7816;
 import javacard.security.CryptoException;
 
@@ -130,4 +131,35 @@ public class Util {
             return String.format("fail\t(%s,\t0x%04x)", codeStr, code);
         }
     }
+
+    public static String getCorruption(byte corruptionType) {
+        String corrupt;
+        switch (corruptionType) {
+            case EC_Consts.CORRUPTION_NONE:
+                corrupt = "NONE";
+                break;
+            case EC_Consts.CORRUPTION_FIXED:
+                corrupt = "FIXED";
+                break;
+            case EC_Consts.CORRUPTION_ONE:
+                corrupt = "ONE";
+                break;
+            case EC_Consts.CORRUPTION_ZERO:
+                corrupt = "ZERO";
+                break;
+            case EC_Consts.CORRUPTION_ONEBYTERANDOM:
+                corrupt = "ONE_BYTE_RANDOM";
+                break;
+            case EC_Consts.CORRUPTION_FULLRANDOM:
+                corrupt = "FULL_RANDOM";
+                break;
+            case EC_Consts.CORRUPTION_INCREMENT:
+                corrupt = "INCREMENT";
+                break;
+            default:
+                corrupt = "UNKNOWN";
+                break;
+        }
+        return corrupt;
+    }
 }