v0.2.0

4 files changed, 150 insertions, 296 deletions

diff --git a/src/cz/crcs/ectester/applet/ECKeyGenerator.java b/src/cz/crcs/ectester/applet/ECKeyGenerator.java
index 0c20333..b026cfe 100644
--- a/src/cz/crcs/ectester/applet/ECKeyGenerator.java
+++ b/src/cz/crcs/ectester/applet/ECKeyGenerator.java
@@ -201,13 +201,13 @@ public class ECKeyGenerator {
                     break;
                 case EC_Consts.PARAMETER_F2M:
                     if (length == 4) {
-                        short i = Util.makeShort(data[(short) (offset + 2)], data[(short) (offset + 3)]);
+                        short i = Util.getShort(data, (short) (offset + 2));
                         if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i);
                         if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i);
                     } else if (length == 8) {
-                        short i1 = Util.makeShort(data[(short) (offset + 2)], data[(short) (offset + 3)]);
-                        short i2 = Util.makeShort(data[(short) (offset + 4)], data[(short) (offset + 5)]);
-                        short i3 = Util.makeShort(data[(short) (offset + 6)], data[(short) (offset + 7)]);
+                        short i1 = Util.getShort(data, (short) (offset + 2));
+                        short i2 = Util.getShort(data, (short) (offset + 4));
+                        short i3 = Util.getShort(data, (short) (offset + 6));
 //                        if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i1, i2, i3);
 //                        if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i1, i2, i3);
                         // TODO: fix this, ^^ fails on jcardsim, but is up to spec
diff --git a/src/cz/crcs/ectester/applet/ECKeyTester.java b/src/cz/crcs/ectester/applet/ECKeyTester.java
index 0b3c1e0..36515ef 100644
--- a/src/cz/crcs/ectester/applet/ECKeyTester.java
+++ b/src/cz/crcs/ectester/applet/ECKeyTester.java
@@ -3,7 +3,6 @@ package cz.crcs.ectester.applet;
 
 import javacard.framework.CardRuntimeException;
 import javacard.framework.ISO7816;
-import javacard.framework.ISOException;
 import javacard.security.*;
 
 /**
@@ -13,77 +12,35 @@ import javacard.security.*;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class ECKeyTester {
-
-    private KeyAgreement ecdhKeyAgreement = null;
-    private KeyAgreement ecdhcKeyAgreement = null;
+    private KeyAgreement ecKeyAgreement = null;
+    private short kaType = 0;
     private Signature ecdsaSignature = null;
+    private short sigType = 0;
 
     private short sw = ISO7816.SW_NO_ERROR;
 
-    public short allocateECDH(byte algorithm) {
+    public short allocateKA(byte algorithm) {
         sw = ISO7816.SW_NO_ERROR;
         try {
-            ecdhKeyAgreement = KeyAgreement.getInstance(algorithm, false);
+            ecKeyAgreement = KeyAgreement.getInstance(algorithm, false);
+            kaType = algorithm;
         } catch (CardRuntimeException ce) {
             sw = ce.getReason();
         }
         return sw;
     }
 
-    public short allocateECDHC(byte algorithm) {
+    public short allocateSig(byte algorithm) {
         sw = ISO7816.SW_NO_ERROR;
         try {
-            ecdhcKeyAgreement = KeyAgreement.getInstance(algorithm, false);
+            ecdsaSignature = Signature.getInstance(algorithm, false);
+            sigType = algorithm;
         } catch (CardRuntimeException ce) {
             sw = ce.getReason();
         }
         return sw;
     }
 
-    public short allocateECDSA() {
-        sw = ISO7816.SW_NO_ERROR;
-        try {
-            ecdsaSignature = Signature.getInstance(Signature.ALG_ECDSA_SHA, false);
-        } catch (CardRuntimeException ce) {
-            sw = ce.getReason();
-        }
-        return sw;
-    }
-
-    private short testKA(KeyAgreement ka, KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
-        short length = 0;
-        try {
-            sw = AppletUtil.kaCheck(ka);
-            sw = AppletUtil.keypairCheck(privatePair);
-            sw = AppletUtil.keypairCheck(publicPair);
-            short pubkeyLength = ((ECPublicKey) publicPair.getPublic()).getW(pubkeyBuffer, pubkeyOffset);
-            // reached ok
-            ka.init(privatePair.getPrivate()); // throws UNITIALIZED KEY when ALG_EC_SVDP_DHC_PLAIN is used
-            //ISOException.throwIt((short) 0x666);
-            
-            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkeyBuffer, pubkeyOffset, pubkeyLength);
-            length = ka.generateSecret(pubkeyBuffer, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset);
-        } catch (CardRuntimeException ce) {
-            sw = ce.getReason();
-        }
-        return length;
-    }
-
-    private short testKA_direct(KeyAgreement ka, KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short corruption) {
-        short length = 0;
-        try {
-            sw = AppletUtil.kaCheck(ka);
-            sw = AppletUtil.keypairCheck(privatePair);
-
-            ka.init(privatePair.getPrivate());
-            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkey, pubkeyOffset, pubkeyLength);
-            length = ka.generateSecret(pubkey, pubkeyOffset, pubkeyLength, outpuBuffer, outputOffset);
-        } catch (CardRuntimeException ce)  {
-            sw = ce.getReason();
-        }
-        return length;
-    }
-
     /**
      * Tests ECDH secret generation with keys from given {@code privatePair} and {@code publicPair}.
      * Uses {@code pubkeyBuffer} at {@code pubkeyOffset} for computations.
@@ -98,100 +55,46 @@ public class ECKeyTester {
      * @param corruption   (EC_Consts.CORRUPTION_* | ...)
      * @return derived secret length
      **/
-    public short testECDH(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
-        return testKA(ecdhKeyAgreement, privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
-    }
-
-    public short testECDH_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short corruption) {
-        return testKA_direct(ecdhKeyAgreement, privatePair, pubkey, pubkeyOffset, pubkeyLength, outpuBuffer, outputOffset, corruption);
-    }
-
-    /**
-     * Tests ECDHC secret generation with keys from given {@code privatePair} and {@code publicPair}.
-     * Uses {@code pubkeyBuffer} at {@code pubkeyOffset} for computations.
-     * Output should equal to ECDH output.
-     *
-     * @param privatePair  KeyPair from which the private key is used
-     * @param publicPair   KeyPair from which the public key is used
-     * @param pubkeyBuffer buffer to be used for the public key
-     * @param pubkeyOffset offset into pubkeyBuffer that can be used for the public key
-     * @param outputBuffer buffer to be used for the secret output
-     * @param outputOffset offset into the outputBuffer
-     * @param corruption   (EC_Consts.CORRUPTION_* | ...)
-     * @return derived secret length
-     */
-    public short testECDHC(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
-        return testKA(ecdhcKeyAgreement, privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
-    }
-
-    public short testECDHC_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short corruption) {
-        return testKA_direct(ecdhcKeyAgreement, privatePair, pubkey, pubkeyOffset, pubkeyLength, outpuBuffer, outputOffset, corruption);
-    }
-
-    /**
-     * @param privatePair  KeyPair from which the private key is used
-     * @param publicPair   KeyPair from which the public key is used
-     * @param pubkeyBuffer buffer to be used for the public key
-     * @param pubkeyOffset offset into pubkeyBuffer that can be used for the public key
-     * @param outputBuffer buffer to be used for the secret output
-     * @param outputOffset offset into the outputBuffer
-     * @param corruption   (EC_Consts.CORRUPTION_* | ...)
-     * @return
-     */
-    public short testBOTH(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
-        short ecdhLength = testECDH(privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
-        if (sw != ISO7816.SW_NO_ERROR) {
-            return ecdhLength;
-        }
-        short ecdhcLength = testECDHC(privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, (short) (outputOffset + ecdhLength), corruption);
-        short length = (short) (ecdhLength + ecdhcLength);
-        if (sw != ISO7816.SW_NO_ERROR) {
-            return length;
-        }
-        if (javacard.framework.Util.arrayCompare(outputBuffer, outputOffset, outputBuffer, (short) (outputOffset + ecdhLength), ecdhLength) != 0) {
-            sw = ECTesterApplet.SW_DH_DHC_MISMATCH;
-        }
-        return length;
-    }
+    public short testKA(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
+        short length = 0;
+        try {
+            sw = AppletUtil.kaCheck(ecKeyAgreement);
+            sw = AppletUtil.keypairCheck(privatePair);
+            sw = AppletUtil.keypairCheck(publicPair);
+            short pubkeyLength = ((ECPublicKey) publicPair.getPublic()).getW(pubkeyBuffer, pubkeyOffset);
+            ecKeyAgreement.init(privatePair.getPrivate());
 
-    public short testBOTH_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outputBuffer, short outputOffset, short corruption) {
-        short ecdhLength = testECDH_direct(privatePair, pubkey, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset, corruption);
-        if (sw != ISO7816.SW_NO_ERROR) {
-            return ecdhLength;
-        }
-        short ecdhcLength = testECDHC_direct(privatePair, pubkey, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset, corruption);
-        short length = (short) (ecdhLength + ecdhcLength);
-        if (sw != ISO7816.SW_NO_ERROR) {
-            return length;
-        }
-        if (javacard.framework.Util.arrayCompare(outputBuffer, outputOffset, outputBuffer, (short) (outputOffset + ecdhLength), ecdhLength) != 0) {
-            sw = ECTesterApplet.SW_DH_DHC_MISMATCH;
+            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkeyBuffer, pubkeyOffset, pubkeyLength);
+            length = ecKeyAgreement.generateSecret(pubkeyBuffer, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset);
+        } catch (CardRuntimeException ce) {
+            sw = ce.getReason();
         }
         return length;
     }
 
     /**
-     * @param privatePair  KeyPair from which the private key is used
-     * @param publicPair   KeyPair from which the public key is used
-     * @param pubkeyBuffer buffer to be used for the public key
-     * @param pubkeyOffset offset into pubkeyBuffer that can be used for the public key
-     * @param outputBuffer buffer to be used for the secret output
-     * @param outputOffset offset into the outputBuffer
-     * @param corruption   (EC_Consts.CORRUPTION_* | ...)
+     * @param privatePair
+     * @param pubkey
+     * @param pubkeyOffset
+     * @param pubkeyLength
+     * @param outpuBuffer
+     * @param outputOffset
+     * @param corruption
      * @return
      */
-    public short testANY(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
-        short ecdhLength = testECDH(privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
-        if (sw == ISO7816.SW_NO_ERROR)
-            return ecdhLength;
-        return testECDHC(privatePair, publicPair, pubkeyBuffer, pubkeyOffset, outputBuffer, outputOffset, corruption);
-    }
+    public short testKA_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short corruption) {
+        short length = 0;
+        try {
+            sw = AppletUtil.kaCheck(ecKeyAgreement);
+            sw = AppletUtil.keypairCheck(privatePair);
 
-    public short testANY_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outputBuffer, short outputOffset, short corruption) {
-        short ecdhLength = testECDH_direct(privatePair, pubkey, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset, corruption);
-        if (sw == ISO7816.SW_NO_ERROR)
-            return ecdhLength;
-        return testECDHC_direct(privatePair, pubkey, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset, corruption);
+            ecKeyAgreement.init(privatePair.getPrivate());
+            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkey, pubkeyOffset, pubkeyLength);
+            length = ecKeyAgreement.generateSecret(pubkey, pubkeyOffset, pubkeyLength, outpuBuffer, outputOffset);
+        } catch (CardRuntimeException ce) {
+            sw = ce.getReason();
+        }
+        return length;
     }
 
     /**
@@ -227,32 +130,31 @@ public class ECKeyTester {
         return length;
     }
 
-    public KeyAgreement getECDH() {
-        return ecdhKeyAgreement;
+    public KeyAgreement getKA() {
+        return ecKeyAgreement;
     }
 
-    public KeyAgreement getECDHC() {
-        return ecdhcKeyAgreement;
+    public Signature getSig() {
+        return ecdsaSignature;
     }
 
-    public Signature getECDSA() {
-        return ecdsaSignature;
+    public boolean hasKA() {
+        return ecKeyAgreement != null;
     }
 
-    public boolean hasECDH() {
-        return ecdhKeyAgreement != null;
+    public boolean hasSig() {
+        return ecdsaSignature != null;
     }
 
-    public boolean hasECDHC() {
-        return ecdhcKeyAgreement != null;
+    public short getKaType() {
+        return kaType;
     }
 
-    public boolean hasECDSA() {
-        return ecdsaSignature != null;
+    public short getSigType() {
+        return sigType;
     }
 
     public short getSW() {
         return sw;
     }
-
 }
diff --git a/src/cz/crcs/ectester/applet/ECTesterApplet.java b/src/cz/crcs/ectester/applet/ECTesterApplet.java
index ecf97f2..20e3f05 100644
--- a/src/cz/crcs/ectester/applet/ECTesterApplet.java
+++ b/src/cz/crcs/ectester/applet/ECTesterApplet.java
@@ -26,11 +26,7 @@
 package cz.crcs.ectester.applet;
 
 import javacard.framework.*;
-import javacard.security.ECPrivateKey;
-import javacard.security.ECPublicKey;
-import javacard.security.KeyAgreement;
-import javacard.security.KeyPair;
-import javacard.security.RandomData;
+import javacard.security.*;
 import javacardx.apdu.ExtendedLength;
 
 /**
@@ -55,10 +51,11 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     public static final byte INS_ECDH_DIRECT = (byte) 0x71;
     public static final byte INS_ECDSA = (byte) 0x72;
     public static final byte INS_CLEANUP = (byte) 0x73;
-    public static final byte INS_SUPPORT = (byte) 0x74;
+    //public static final byte INS_SUPPORT = (byte) 0x74;
     public static final byte INS_ALLOCATE_KA = (byte) 0x75;
-    
-            
+    public static final byte INS_ALLOCATE_SIG = (byte) 0x76;
+
+
     // PARAMETERS for P1 and P2
     public static final byte KEYPAIR_LOCAL = (byte) 0x01;
     public static final byte KEYPAIR_REMOTE = (byte) 0x02;
@@ -72,10 +69,9 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     public static final short SW_KEYPAIR_NULL = (short) 0x0ee3;
     public static final short SW_KA_NULL = (short) 0x0ee4;
     public static final short SW_SIGNATURE_NULL = (short) 0x0ee5;
-    public static final short SW_OBJECT_NULL = (short) 0x0ee6;    
-    public static final short SW_KA_UNSUPPORTED = (short) 0x0ee7;
+    public static final short SW_OBJECT_NULL = (short) 0x0ee6;
+
 
-    
     // Class javacard.security.KeyAgreement
     // javacard.security.KeyAgreement Fields:
     public static final byte KeyAgreement_ALG_EC_SVDP_DH = 1;
@@ -86,8 +82,14 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     public static final byte KeyAgreement_ALG_EC_SVDP_DHC_PLAIN = 4;
     public static final byte KeyAgreement_ALG_EC_PACE_GM = 5;
     public static final byte KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY = 6;
-    public static final byte KeyAgreement_ALG_DH_PLAIN = 7;    
 
+    // Class javacard.security.Signature
+    // javacard.security.Signature Fields:
+    public static final byte Signature_ALG_ECDSA_SHA = 17;
+    public static final byte Signature_ALG_ECDSA_SHA_256 = 33;
+    public static final byte Signature_ALG_ECDSA_SHA_384 = 34;
+    public static final byte Signature_ALG_ECDSA_SHA_224 = 37;
+    public static final byte Signature_ALG_ECDSA_SHA_512 = 38;
 
     private static final short ARRAY_LENGTH = (short) 0xff;
     private static final short APDU_MAX_LENGTH = (short) 1024;
@@ -98,13 +100,9 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     // PERSISTENT ARRAY IN EEPROM
     private byte[] dataArray = null; // unused
 
-
     private RandomData randomData = null;
 
     private ECKeyTester keyTester = null;
-    private short ecdhSW;
-    private short ecdhcSW;
-    private short ecdsaSW;
     private ECKeyGenerator keyGenerator = null;
     private KeyPair localKeypair = null;
     private KeyPair remoteKeypair = null;
@@ -133,11 +131,6 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
 
             keyGenerator = new ECKeyGenerator();
             keyTester = new ECKeyTester();
-            ecdhSW = keyTester.allocateECDH(KeyAgreement.ALG_EC_SVDP_DH);
-            ecdhcSW = keyTester.allocateECDHC(KeyAgreement.ALG_EC_SVDP_DHC);
-            //ecdhSW = keyTester.allocateECDH((byte) 3);
-            //ecdhcSW = keyTester.allocateECDHC((byte) 4);
-            ecdsaSW = keyTester.allocateECDSA();
         }
         register();
     }
@@ -163,9 +156,12 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
 
             short length = 0;
             switch (ins) {
-                case INS_ALLOCATE_KA: 
+                case INS_ALLOCATE_KA:
                     length = insAllocateKA(apdu);
                     break;
+                case INS_ALLOCATE_SIG:
+                    length = insAllocateSig(apdu);
+                    break;
                 case INS_ALLOCATE:
                     length = insAllocate(apdu);
                     break;
@@ -196,9 +192,6 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
                 case INS_CLEANUP:
                     length = insCleanup(apdu);
                     break;
-                case INS_SUPPORT:
-                    length = insSupport(apdu);
-                    break;
                 default:
                     // The INS code is not supported by the dispatcher
                     ISOException.throwIt(ISO7816.SW_INS_NOT_SUPPORTED);
@@ -208,9 +201,9 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
             apdu.setOutgoingAndSend((short) 0, length);
         } else ISOException.throwIt(ISO7816.SW_CLA_NOT_SUPPORTED);
     }
-    
+
     /**
-     * Allocates KeyAgreement object. returns allocate SW
+     * Allocates KeyAgreement object, returns allocate SW.
      *
      * @param apdu DATA = byte KeyAgreementType
      * @return length of response
@@ -218,35 +211,25 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     private short insAllocateKA(APDU apdu) {
         short cdata = apdu.getOffsetCdata();
         byte kaType = apduArray[cdata];
-/*
-        short sw = SW_KA_UNSUPPORTED;
-        switch (kaType) {
-            case KeyAgreement_ALG_EC_SVDP_DH: // no break
-            case KeyAgreement_ALG_EC_SVDP_DH_PLAIN:
-            case KeyAgreement_ALG_EC_PACE_GM:
-            case KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY:
-                sw = keyTester.allocateECDH(kaType);
-                break;
-            case KeyAgreement_ALG_EC_SVDP_DHC:
-            case KeyAgreement_ALG_EC_SVDP_DHC_PLAIN: 
-                sw = keyTester.allocateECDHC(kaType);
-                break;
-            default:
-                sw = SW_KA_UNSUPPORTED;
-                break;
-        }
-*/        
-        // Allocate given type into both DH and DHC objects
-        short sw = keyTester.allocateECDH(kaType);
-        short offset = 0;
-        Util.setShort(apdu.getBuffer(), offset, sw);
-        offset += 2;
-        
-        //sw = keyTester.allocateECDHC(kaType);
-        Util.setShort(apdu.getBuffer(), offset, sw);
-        offset += 2;
-        return offset;
-    }    
+        short sw = keyTester.allocateKA(kaType);
+        Util.setShort(apdu.getBuffer(), (short) 0, sw);
+        return 2;
+    }
+
+    /**
+     * Allocates a Signature object, returns allocate SW.
+     *
+     * @param apdu DATA = byte SignatureType
+     * @return length of response
+     */
+    private short insAllocateSig(APDU apdu) {
+        short cdata = apdu.getOffsetCdata();
+        byte sigType = apduArray[cdata];
+        short sw = keyTester.allocateSig(sigType);
+        Util.setShort(apdu.getBuffer(), (short) 0, sw);
+        return 2;
+    }
+
     /**
      * Allocates local and remote keyPairs.
      * returns allocate SWs
@@ -422,13 +405,15 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     }
 
     /**
+     * Performs ECDH, directly between the privkey specified in P1(local/remote) and the raw data
      *
      * @param apdu P1   = byte privkey (KEYPAIR_*)
-     * @return     P2   = byte export (EXPORT_TRUE || EXPORT_FALSE)
+     *             P2   = byte export (EXPORT_TRUE || EXPORT_FALSE)
      *             DATA = short corruption (EC_Consts.CORRUPTION_* | ...)
      *             byte type (EC_Consts.KA_* | ...)
      *             short length
      *             byte[] pubkey
+     * @return length of response
      */
     private short insECDH_direct(APDU apdu) {
         byte privkey = apduArray[ISO7816.OFFSET_P1];
@@ -447,7 +432,8 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
      *
      * @param apdu P1   = byte keyPair (KEYPAIR_*)
      *             P2   = byte export (EXPORT_TRUE || EXPORT_FALSE)
-     *             DATA = short dataLength (00 = random data generated, !00 = data length)
+     *             DATA = byte sigType
+     *             short dataLength (00 = random data generated, !00 = data length)
      *             byte[] data
      * @return length of response
      */
@@ -455,13 +441,14 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
         byte keyPair = apduArray[ISO7816.OFFSET_P1];
         byte export = apduArray[ISO7816.OFFSET_P2];
         short cdata = apdu.getOffsetCdata();
+        byte sigType = apduArray[cdata];
 
         short len = 0;
         if ((keyPair & KEYPAIR_LOCAL) != 0) {
-            len += ecdsa(localKeypair, export, apduArray, cdata, apdu.getBuffer(), (short) 0);
+            len += ecdsa(localKeypair, sigType, export, apduArray, (short) (cdata + 1), apdu.getBuffer(), (short) 0);
         }
         if ((keyPair & KEYPAIR_REMOTE) != 0) {
-            len += ecdsa(remoteKeypair, export, apduArray, cdata, apdu.getBuffer(), len);
+            len += ecdsa(remoteKeypair, sigType, export, apduArray, (short) (cdata + 1), apdu.getBuffer(), len);
         }
 
         return len;
@@ -480,19 +467,6 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
     }
 
     /**
-     * Returns data about card support for various EC related tasks collected on applet
-     * install.
-     *
-     * @param apdu no data
-     * @return length of response
-     */
-    private short insSupport(APDU apdu) {
-        byte[] apdubuf = apdu.getBuffer();
-
-        return support(apdubuf, (short) 0);
-    }
-
-    /**
      * @param keyPair   which keyPair to use, local/remote (KEYPAIR_* | ...)
      * @param keyLength key length to set
      * @param keyClass  key class to allocate
@@ -623,7 +597,7 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
      * @param privkey    keyPair to use for private key, (KEYPAIR_LOCAL || KEYPAIR_REMOTE)
      * @param export     whether to export ECDH secret
      * @param corruption whether to invalidate the pubkey before ECDH
-     * @param type       KeyAgreement type to test (EC_Consts.KA_* || ...)
+     * @param type       KeyAgreement type to test
      * @param outBuffer  buffer to write sw to, and export ECDH secret {@code if(export == EXPORT_TRUE)}
      * @param outOffset  output offset in buffer
      * @return length of data written to the buffer
@@ -635,23 +609,14 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
         KeyPair priv = ((privkey & KEYPAIR_LOCAL) != 0) ? localKeypair : remoteKeypair;
 
         short secretLength = 0;
-        switch (type) {
-            case EC_Consts.KA_ECDH:
-                secretLength = keyTester.testECDH(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
-                break;
-            case EC_Consts.KA_ECDHC:
-                secretLength = keyTester.testECDHC(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
-                break;
-            case EC_Consts.KA_BOTH:
-                secretLength = keyTester.testBOTH(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
-                break;
-            case EC_Consts.KA_ANY:
-                secretLength = keyTester.testANY(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
-                break;
-            default:
-                ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        if (keyTester.getKaType() == type) {
+            secretLength = keyTester.testKA(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
+        } else {
+            short allocateSW = keyTester.allocateKA(type);
+            if (allocateSW == ISO7816.SW_NO_ERROR) {
+                secretLength = keyTester.testKA(priv, pub, ramArray, (short) 0, ramArray2, (short) 0, corruption);
+            }
         }
-
         Util.setShort(outBuffer, outOffset, keyTester.getSW());
         length += 2;
 
@@ -671,21 +636,13 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
         KeyPair priv = ((privkey & KEYPAIR_LOCAL) != 0) ? localKeypair : remoteKeypair;
 
         short secretLength = 0;
-        switch (type) {
-            case EC_Consts.KA_ECDH:
-                secretLength = keyTester.testECDH_direct(priv, apduArray, keyOffset, keyLength, outBuffer, outOffset, corruption);
-                break;
-            case EC_Consts.KA_ECDHC:
-                secretLength = keyTester.testECDHC_direct(priv, apduArray, keyOffset, keyLength, outBuffer, outOffset, corruption);
-                break;
-            case EC_Consts.KA_BOTH:
-                secretLength = keyTester.testBOTH_direct(priv, apduArray, keyOffset, keyLength, outBuffer, outOffset, corruption);
-                break;
-            case EC_Consts.KA_ANY:
-                secretLength = keyTester.testANY_direct(priv, apduArray, keyOffset, keyLength, outBuffer, outOffset, corruption);
-                break;
-            default:
-                ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        if (keyTester.getKaType() == type) {
+            secretLength = keyTester.testKA_direct(priv, apduArray, keyOffset, keyLength, ramArray2, (short) 0, corruption);
+        } else {
+            short allocateSW = keyTester.allocateKA(type);
+            if (allocateSW == ISO7816.SW_NO_ERROR) {
+                secretLength = keyTester.testKA_direct(priv, apduArray, keyOffset, keyLength, ramArray2, (short) 0, corruption);
+            }
         }
 
         Util.setShort(outBuffer, outOffset, keyTester.getSW());
@@ -702,6 +659,7 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
 
     /**
      * @param sign      keyPair to use for signing and verification
+     * @param sigType   Signature type to use
      * @param export    whether to export ECDSA signature
      * @param inBuffer  buffer to read dataLength and data to sign from
      * @param inOffset  input offset in buffer
@@ -709,7 +667,7 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
      * @param outOffset output offset in buffer
      * @return length of data written to the buffer
      */
-    private short ecdsa(KeyPair sign, byte export, byte[] inBuffer, short inOffset, byte[] outBuffer, short outOffset) {
+    private short ecdsa(KeyPair sign, byte sigType, byte export, byte[] inBuffer, short inOffset, byte[] outBuffer, short outOffset) {
         short length = 0;
 
         short dataLength = Util.getShort(inBuffer, inOffset);
@@ -721,7 +679,15 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
             Util.arrayCopyNonAtomic(inBuffer, (short) (inOffset + 2), ramArray, (short) 0, dataLength);
         }
 
-        short signatureLength = keyTester.testECDSA((ECPrivateKey) sign.getPrivate(), (ECPublicKey) sign.getPublic(), ramArray, (short) 0, dataLength, ramArray2, (short) 0);
+        short signatureLength = 0;
+        if (keyTester.getSigType() == sigType) {
+            signatureLength = keyTester.testECDSA((ECPrivateKey) sign.getPrivate(), (ECPublicKey) sign.getPublic(), ramArray, (short) 0, dataLength, ramArray2, (short) 0);
+        } else {
+            short allocateSW = keyTester.allocateSig(sigType);
+            if (allocateSW == ISO7816.SW_NO_ERROR) {
+                signatureLength = keyTester.testECDSA((ECPrivateKey) sign.getPrivate(), (ECPublicKey) sign.getPublic(), ramArray, (short) 0, dataLength, ramArray2, (short) 0);
+            }
+        }
         Util.setShort(outBuffer, outOffset, keyTester.getSW());
         length += 2;
 
@@ -753,30 +719,4 @@ public class ECTesterApplet extends Applet implements ExtendedLength {
         Util.setShort(buffer, offset, sw);
         return 2;
     }
-
-    /**
-     * @param buffer buffer to write sw to
-     * @param offset output offset in buffer
-     * @return length of data written to the buffer
-     */
-    private short support(byte[] buffer, short offset) {
-
-        if (keyTester.hasECDH()) {
-            Util.setShort(buffer, offset, ecdhSW);
-        } else {
-            Util.setShort(buffer, offset, ISO7816.SW_FUNC_NOT_SUPPORTED);
-        }
-        if (keyTester.hasECDHC()) {
-            Util.setShort(buffer, (short) (offset + 2), ecdhcSW);
-        } else {
-            Util.setShort(buffer, (short) (offset + 2), ISO7816.SW_FUNC_NOT_SUPPORTED);
-        }
-        if (keyTester.hasECDSA()) {
-            Util.setShort(buffer, (short) (offset + 4), ecdsaSW);
-        } else {
-            Util.setShort(buffer, (short) (offset + 4), ISO7816.SW_FUNC_NOT_SUPPORTED);
-        }
-
-        return 6;
-    }
 }
diff --git a/src/cz/crcs/ectester/applet/EC_Consts.java b/src/cz/crcs/ectester/applet/EC_Consts.java
index 04cd55e..4581fd6 100644
--- a/src/cz/crcs/ectester/applet/EC_Consts.java
+++ b/src/cz/crcs/ectester/applet/EC_Consts.java
@@ -59,13 +59,6 @@ public class EC_Consts {
     public static final byte KEY_PRIVATE = 0x02;
     public static final byte KEY_BOTH = KEY_PUBLIC | KEY_PRIVATE;
 
-
-    // Key Agreement test identifiers
-    public static final byte KA_ECDH = 0x01;
-    public static final byte KA_ECDHC = 0x02;
-    public static final byte KA_BOTH = KA_ECDH | KA_ECDHC;
-    public static final byte KA_ANY = 0x04;
-
     public static RandomData randomData = null;
 
     // secp112r1
@@ -1009,7 +1002,7 @@ public class EC_Consts {
     public static final byte CURVE_default = (byte) 0;
     public static final byte CURVE_external = (byte) 0xff;
 
-    // SECP recommended curves over FP
+    // SECG recommended curves over FP
     public static final byte CURVE_secp112r1 = (byte) 1;
     public static final byte CURVE_secp128r1 = (byte) 2;
     public static final byte CURVE_secp160r1 = (byte) 3;
@@ -1021,7 +1014,7 @@ public class EC_Consts {
 
     public static final byte FP_CURVES = (byte) 8;
 
-    // SECP recommended curves over F2M
+    // SECG recommended curves over F2M
     public static final byte CURVE_sect163r1 = (byte) 9;
     public static final byte CURVE_sect233r1 = (byte) 10;
     public static final byte CURVE_sect283r1 = (byte) 11;
@@ -1033,6 +1026,25 @@ public class EC_Consts {
     public static final short[] FP_SIZES = new short[]{112, 128, 160, 192, 224, 256, 384, 521};
     public static final short[] F2M_SIZES = new short[]{163, 233, 283, 409, 571};
 
+    public static final byte[] KA_TYPES = new byte[]{
+            ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH,
+            //ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH_KDF, //duplicate
+            ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DHC,
+            //ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DHC_KDF, //duplicate
+            ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH_PLAIN,
+            ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DHC_PLAIN,
+            ECTesterApplet.KeyAgreement_ALG_EC_PACE_GM,
+            ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY
+    };
+
+    public static final byte[] SIG_TYPES = new byte[]{
+            ECTesterApplet.Signature_ALG_ECDSA_SHA,
+            ECTesterApplet.Signature_ALG_ECDSA_SHA_224,
+            ECTesterApplet.Signature_ALG_ECDSA_SHA_256,
+            ECTesterApplet.Signature_ALG_ECDSA_SHA_384,
+            ECTesterApplet.Signature_ALG_ECDSA_SHA_512
+    };
+
     public static byte getCurve(short keyLength, byte keyClass) {
         if (keyClass == KeyPair.ALG_EC_FP) {
             switch (keyLength) {