1 files changed, 56 insertions, 6 deletions
diff --git a/src/cz/crcs/ectester/applet/ECKeyTester.java b/src/cz/crcs/ectester/applet/ECKeyTester.java
index 36515ef..7c091e3 100644
--- a/src/cz/crcs/ectester/applet/ECKeyTester.java
+++ b/src/cz/crcs/ectester/applet/ECKeyTester.java
@@ -52,10 +52,10 @@ public class ECKeyTester {
      * @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 transformation   (EC_Consts.TRANSFORMATION_* | ...)
      * @return derived secret length
      **/
-    public short testKA(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short corruption) {
+    public short testKA(KeyPair privatePair, KeyPair publicPair, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset, short transformation) {
         short length = 0;
         try {
             sw = AppletUtil.kaCheck(ecKeyAgreement);
@@ -64,7 +64,7 @@ public class ECKeyTester {
             short pubkeyLength = ((ECPublicKey) publicPair.getPublic()).getW(pubkeyBuffer, pubkeyOffset);
             ecKeyAgreement.init(privatePair.getPrivate());
 
-            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkeyBuffer, pubkeyOffset, pubkeyLength);
+            pubkeyLength = EC_Consts.transformParameter(transformation, pubkeyBuffer, pubkeyOffset, pubkeyLength);
             length = ecKeyAgreement.generateSecret(pubkeyBuffer, pubkeyOffset, pubkeyLength, outputBuffer, outputOffset);
         } catch (CardRuntimeException ce) {
             sw = ce.getReason();
@@ -79,17 +79,17 @@ public class ECKeyTester {
      * @param pubkeyLength
      * @param outpuBuffer
      * @param outputOffset
-     * @param corruption
+     * @param transformation
      * @return
      */
-    public short testKA_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short corruption) {
+    public short testKA_direct(KeyPair privatePair, byte[] pubkey, short pubkeyOffset, short pubkeyLength, byte[] outpuBuffer, short outputOffset, short transformation) {
         short length = 0;
         try {
             sw = AppletUtil.kaCheck(ecKeyAgreement);
             sw = AppletUtil.keypairCheck(privatePair);
 
             ecKeyAgreement.init(privatePair.getPrivate());
-            pubkeyLength = EC_Consts.corruptParameter(corruption, pubkey, pubkeyOffset, pubkeyLength);
+            pubkeyLength = EC_Consts.transformParameter(transformation, pubkey, pubkeyOffset, pubkeyLength);
             length = ecKeyAgreement.generateSecret(pubkey, pubkeyOffset, pubkeyLength, outpuBuffer, outputOffset);
         } catch (CardRuntimeException ce) {
             sw = ce.getReason();
@@ -130,6 +130,56 @@ public class ECKeyTester {
         return length;
     }
 
+    /**
+     *
+     * @param signKey
+     * @param inputBuffer
+     * @param inputOffset
+     * @param inputLength
+     * @param sigBuffer
+     * @param sigOffset
+     * @return
+     */
+    public short testECDSA_sign(ECPrivateKey signKey, byte[] inputBuffer, short inputOffset, short inputLength, byte[] sigBuffer, short sigOffset) {
+        short length = 0;
+        try {
+            sw = AppletUtil.signCheck(ecdsaSignature);
+
+            ecdsaSignature.init(signKey, Signature.MODE_SIGN);
+            length = ecdsaSignature.sign(inputBuffer, inputOffset, inputLength, sigBuffer, sigOffset);
+        } catch (CardRuntimeException ce) {
+            sw = ce.getReason();
+        }
+        return length;
+    }
+
+    /**
+     *
+     * @param verifyKey
+     * @param inputBuffer
+     * @param inputOffset
+     * @param inputLength
+     * @param sigBuffer
+     * @param sigOffset
+     * @param sigLength
+     * @return
+     */
+    public short testECDSA_verify(ECPublicKey verifyKey, byte[] inputBuffer, short inputOffset, short inputLength, byte[] sigBuffer, short sigOffset, short sigLength) {
+        short length = 0;
+        try {
+            sw = AppletUtil.signCheck(ecdsaSignature);
+
+            ecdsaSignature.init(verifyKey, Signature.MODE_VERIFY);
+            boolean correct = ecdsaSignature.verify(inputBuffer, inputOffset, inputLength, sigBuffer, sigOffset, sigLength);
+            if (!correct) {
+                sw = ECTesterApplet.SW_SIG_VERIFY_FAIL;
+            }
+        } catch (CardRuntimeException ce) {
+            sw = ce.getReason();
+        }
+        return length;
+    }
+
     public KeyAgreement getKA() {
         return ecKeyAgreement;
     }