2 files changed, 47 insertions, 5 deletions
diff --git a/src/cz/crcs/ectester/applet/ECKeyTester.java b/src/cz/crcs/ectester/applet/ECKeyTester.java
index e22094b..64f3024 100644
--- a/src/cz/crcs/ectester/applet/ECKeyTester.java
+++ b/src/cz/crcs/ectester/applet/ECKeyTester.java
@@ -3,6 +3,7 @@ package cz.crcs.ectester.applet;
 
 import javacard.framework.CardRuntimeException;
 import javacard.framework.ISO7816;
+import javacard.framework.Util;
 import javacard.security.ECPrivateKey;
 import javacard.security.ECPublicKey;
 import javacard.security.KeyAgreement;
@@ -105,6 +106,34 @@ public class ECKeyTester {
     }
 
     /**
+     *
+     * @param privateKey
+     * @param publicKey
+     * @param pubkeyBuffer
+     * @param pubkeyOffset
+     * @param outputBuffer
+     * @param outputOffset
+     * @param corruption
+     * @return
+     */
+    public short testKA(ECPrivateKey privateKey, ECPublicKey publicKey, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, byte corruption) {
+        short ecdhLength = testECDH(privateKey, publicKey, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
+        if (sw != ISO7816.SW_NO_ERROR) {
+            return ecdhLength;
+        }
+        short ecdhcLength = testECDHC(privateKey, publicKey, pubkeyBuffer, pubkeyOffset, outputBuffer, (short) (outputOffset + ecdhLength), corruption);
+        short length = (short) (ecdhLength + ecdhcLength);
+        if (sw != ISO7816.SW_NO_ERROR) {
+            return length;
+        }
+        if (Util.arrayCompare(outputBuffer, outputOffset, outputBuffer, (short)(outputOffset + ecdhLength), ecdhLength) != 0) {
+            sw = ECTesterApplet.SW_DH_DHC_MISMATCH;
+        }
+        return length;
+
+    }
+
+    /**
      * Uses {@code signKey} to sign data from {@code inputBuffer} at {@code inputOffset} with {@code inputOffset}.
      * Then checks for correct signature length.
      * Then tries verifying the data with {@code verifyKey}.
diff --git a/src/cz/crcs/ectester/applet/ECTesterApplet.java b/src/cz/crcs/ectester/applet/ECTesterApplet.java
index f9fb5da..98f59c4 100644
--- a/src/cz/crcs/ectester/applet/ECTesterApplet.java
+++ b/src/cz/crcs/ectester/applet/ECTesterApplet.java
@@ -63,6 +63,7 @@ public class ECTesterApplet extends Applet {
 
     // STATUS WORDS
     public static final short SW_SIG_VERIFY_FAIL = (short) 0x0ee1;
+    public static final short SW_DH_DHC_MISMATCH = (short) 0x0ee2;
 
 
     private static final short ARRAY_LENGTH = (short) 0xff;
@@ -556,7 +557,7 @@ public class ECTesterApplet extends Applet {
                 secretLength = keyTester.testECDHC((ECPrivateKey) priv.getPrivate(), (ECPublicKey) pub.getPublic(), ramArray, (short) 0, ramArray2, (short) 0, corruption);
                 break;
             case EC_Consts.KA_BOTH:
-                // TODO
+                secretLength = keyTester.testKA((ECPrivateKey) priv.getPrivate(), (ECPublicKey) pub.getPublic(), ramArray, (short) 0, ramArray2, (short) 0, corruption);
                 break;
             default:
                 ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
@@ -589,7 +590,7 @@ public class ECTesterApplet extends Applet {
         short dataLength = Util.getShort(buffer, inOffset);
         if (dataLength == 0) { //no data to sign
             //generate random
-            dataLength = 32;
+            dataLength = 64;
             randomData.generateData(ramArray, (short) 0, dataLength);
         } else {
             Util.arrayCopyNonAtomic(buffer, (short) (inOffset + 2), ramArray, (short) 0, dataLength);
@@ -636,9 +637,21 @@ public class ECTesterApplet extends Applet {
      */
     private short support(byte[] buffer, short offset) {
 
-        Util.setShort(buffer, offset, ecdhSW);
-        Util.setShort(buffer, (short) (offset+2), ecdhcSW);
-        Util.setShort(buffer, (short) (offset+4), ecdsaSW);
+        if (keyTester.hasECDH()) {
+            Util.setShort(buffer, offset, ecdhSW);
+        } else {
+            Util.setShort(buffer, offset, ISO7816.SW_INS_NOT_SUPPORTED);
+        }
+        if (keyTester.hasECDHC()) {
+            Util.setShort(buffer, (short) (offset+2), ecdhcSW);
+        } else {
+            Util.setShort(buffer, (short) (offset+2), ISO7816.SW_INS_NOT_SUPPORTED);
+        }
+        if (keyTester.hasECDSA()) {
+            Util.setShort(buffer, (short) (offset+4), ecdsaSW);
+        } else {
+            Util.setShort(buffer, (short) (offset+4), ISO7816.SW_INS_NOT_SUPPORTED);
+        }
 
         return 6;
     }