1 files changed, 19 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
index f3242ba..fc1b8d7 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
@@ -78,7 +78,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
 
     @Override
     protected SecretKey engineGenerateSecret(String algorithm) throws IllegalStateException, NoSuchAlgorithmException, InvalidKeyException {
-        // TODO: This is dangerous!
+        // TODO: This is dangerous/not correct ! Need to actually implement KDF1 and KDF2 here probably.
         return new SecretKeySpec(engineGenerateSecret(), algorithm);
     }
 
@@ -93,6 +93,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
 
     public abstract static class Botan extends NativeKeyAgreementSpi {
         private String type;
+
         public Botan(String type) {
             this.type = type;
         }
@@ -136,4 +137,21 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
             super("ECDHwithSHA512KDF");
         }
     }
+
+    public abstract static class Cryptopp extends NativeKeyAgreementSpi {
+        private String type;
+
+        public Cryptopp(String type) {
+            this.type = type;
+        }
+
+        @Override
+        native byte[] generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params);
+    }
+
+    public static class CryptoppECDH extends Cryptopp {
+        public CryptoppECDH() {
+            super("ECDH");
+        }
+    }
 }