From 914931cfea79c7947b180069b0e67cc208971869 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sat, 15 Apr 2017 01:27:24 +0200
Subject: Add invalid curves test(partly) and some parameters (brainpool) for
 it

 - curves.xml, keys.xml and results.xml's entries can now instead of
   file path to point to csv file, contain the csv data inline.
 - Moved EC_Category to reader package from data
 - Fixed printing of named objects
 - Added ECDH/C test for KA_BOTH which does ECDH and ECDHC on the applet
   side, compares the results and reports success/failure etc.
---
 src/cz/crcs/ectester/applet/ECKeyTester.java | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'src/cz/crcs/ectester/applet/ECKeyTester.java')

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;
@@ -104,6 +105,34 @@ public class ECKeyTester {
         return testKA(ecdhcKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, length, outputBuffer, outputOffset);
     }
 
+    /**
+     *
+     * @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.
-- 
cgit v1.2.3-70-g09d2