From 7d946796d87638a5f54cc8562c9d3a95309cf3cc Mon Sep 17 00:00:00 2001
From: J08nY
Date: Mon, 7 Nov 2016 20:26:50 +0100
Subject: ECKeyGenerator: fixes to key genertion, ECKeyTester: fixed ECDH/ECDHC
 pubkey length issue. EC_Consts: fixed decompressG and getCurveParameter array
 copy mismatch SimpleECCApplet: fixed B parameter test

All tests now pass as before.
---
 src/applets/ECKeyTester.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/src/applets/ECKeyTester.java b/src/applets/ECKeyTester.java
index 1031b06..d6ff6c1 100644
--- a/src/applets/ECKeyTester.java
+++ b/src/applets/ECKeyTester.java
@@ -91,13 +91,13 @@ public class ECKeyTester {
      *          exception reason otherwise
      **/
     public short testECDH_validPoint(ECPrivateKey privateKey, ECPublicKey publicKey, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset) {
-        publicKey.getW(pubkeyBuffer, pubkeyOffset);
-        return testDH_validPoint(ecdhKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, (short) pubkeyBuffer.length, outputBuffer, outputOffset);
+        short length = publicKey.getW(pubkeyBuffer, pubkeyOffset);
+        return testDH_validPoint(ecdhKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, length, outputBuffer, outputOffset);
     }
 
     public short testECDH_invalidPoint(ECPrivateKey privateKey, ECPublicKey publicKey, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset) {
-        publicKey.getW(pubkeyBuffer, pubkeyOffset);
-        return testDH_invalidPoint(ecdhKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, (short) pubkeyBuffer.length, outputBuffer, outputOffset);
+        short length = publicKey.getW(pubkeyBuffer, pubkeyOffset);
+        return testDH_invalidPoint(ecdhKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, length, outputBuffer, outputOffset);
     }
 
 
@@ -115,13 +115,13 @@ public class ECKeyTester {
      *          exception reason otherwise
      */
     public short testECDHC_validPoint(ECPrivateKey privateKey, ECPublicKey publicKey, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset) {
-        publicKey.getW(pubkeyBuffer, pubkeyOffset);
-        return testDH_validPoint(ecdhcKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, (short) pubkeyBuffer.length, outputBuffer, outputOffset);
+        short length = publicKey.getW(pubkeyBuffer, pubkeyOffset);
+        return testDH_validPoint(ecdhcKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, length, outputBuffer, outputOffset);
     }
 
     public short testECDHC_invalidPoint(ECPrivateKey privateKey, ECPublicKey publicKey, byte[] pubkeyBuffer, short pubkeyOffset, byte[] outputBuffer, short outputOffset) {
-        publicKey.getW(pubkeyBuffer, pubkeyOffset);
-        return testDH_invalidPoint(ecdhcKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, (short) pubkeyBuffer.length, outputBuffer, outputOffset);
+        short length = publicKey.getW(pubkeyBuffer, pubkeyOffset);
+        return testDH_invalidPoint(ecdhcKeyAgreement, privateKey, pubkeyBuffer, pubkeyOffset, length, outputBuffer, outputOffset);
     }
 
     /**
-- 
cgit v1.2.3-70-g09d2