From 1a0d0b14ff7720b98ffdda4651bf1b58d34203bd Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sat, 26 Nov 2016 19:24:37 +0100
Subject: Added tests for non-prime p, ECDSA into the main test suite. Also
 fixed ECDSA test.

---
 src/applets/ECKeyTester.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/applets/ECKeyTester.java')

diff --git a/src/applets/ECKeyTester.java b/src/applets/ECKeyTester.java
index d6ff6c1..acfb64e 100644
--- a/src/applets/ECKeyTester.java
+++ b/src/applets/ECKeyTester.java
@@ -143,16 +143,12 @@ public class ECKeyTester {
         short result = ISO7816.SW_NO_ERROR;
         try {
             ecdsaSignature.init(signKey, Signature.MODE_SIGN);
-
             short sigLength = ecdsaSignature.sign(inputBuffer, inputOffset, inputLength, sigBuffer, sigOffset);
-            if (sigLength != 20) { // per javacard.security.Signature an ALG_ECDSA_SHA should be 20 bytes.
-                result =  SimpleECCApplet.SW_SIG_LENGTH_MISMATCH;
-            } else {
-                ecdsaSignature.init(verifyKey, Signature.MODE_VERIFY);
-                boolean correct = ecdsaSignature.verify(inputBuffer, inputOffset, inputLength, sigBuffer, sigOffset, sigLength);
-                if (!correct) {
-                    result = SimpleECCApplet.SW_SIG_VERIFY_FAIL;
-                }
+
+            ecdsaSignature.init(verifyKey, Signature.MODE_VERIFY);
+            boolean correct = ecdsaSignature.verify(inputBuffer, inputOffset, inputLength, sigBuffer, sigOffset, sigLength);
+            if (!correct) {
+                result = SimpleECCApplet.SW_SIG_VERIFY_FAIL;
             }
         } catch (CryptoException ce) {
             result = ce.getReason();
-- 
cgit v1.2.3-70-g09d2