1 files changed, 93 insertions, 25 deletions

diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
index 47d1fcc..4ed3469 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
@@ -11,14 +11,15 @@ import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECParameterSpec;
+import java.security.spec.ECGenParameterSpec;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
 public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
-    private ECPrivateKey privateKey;
-    private ECPublicKey publicKey;
-    private ECParameterSpec params;
+    ECPrivateKey privateKey;
+    ECPublicKey publicKey;
+    AlgorithmParameterSpec params;
 
     @Override
     protected void engineInit(Key key, SecureRandom random) throws InvalidKeyException {
@@ -31,15 +32,6 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
     }
 
     @Override
-    protected void engineInit(Key key, AlgorithmParameterSpec params, SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {
-        if (!(params instanceof ECParameterSpec)) {
-            throw new InvalidAlgorithmParameterException();
-        }
-        engineInit(key, random);
-        this.params = (ECParameterSpec) params;
-    }
-
-    @Override
     protected Key engineDoPhase(Key key, boolean lastPhase) throws InvalidKeyException, IllegalStateException {
         if (privateKey == null) {
             throw new IllegalStateException("Not initialized");
@@ -60,13 +52,6 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
     }
 
     @Override
-    protected byte[] engineGenerateSecret() throws IllegalStateException {
-        byte[] pubkey = ECUtil.toX962Uncompressed(publicKey.getW(), params.getCurve());
-        byte[] privkey = ECUtil.toByteArray(privateKey.getS(), params.getCurve().getField().getFieldSize());
-        return generateSecret(pubkey, privkey, params);
-    }
-
-    @Override
     protected int engineGenerateSecret(byte[] sharedSecret, int offset) throws IllegalStateException, ShortBufferException {
         byte[] secret = engineGenerateSecret();
         if (sharedSecret.length < offset + secret.length) {
@@ -78,20 +63,68 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
 
     @Override
     protected SecretKey engineGenerateSecret(String algorithm) throws IllegalStateException, NoSuchAlgorithmException, InvalidKeyException {
-        // TODO: This is dangerous/not correct ! Need to actually implement KDF1 and KDF2 here probably.
+        // TODO: This is dangerous/not correct ! Need to actually implement KDF1 and KDF2 here probably. Or just pass it off to the libs through some different interface.
         return new SecretKeySpec(engineGenerateSecret(), algorithm);
     }
 
-    abstract byte[] generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params);
+    private abstract static class SimpleKeyAgreementSpi extends NativeKeyAgreementSpi {
+
+        @Override
+        protected void engineInit(Key key, AlgorithmParameterSpec params, SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {
+            if (!(params instanceof ECParameterSpec)) {
+                throw new InvalidAlgorithmParameterException();
+            }
+            engineInit(key, random);
+            this.params = params;
+        }
+
+        @Override
+        protected byte[] engineGenerateSecret() throws IllegalStateException {
+            byte[] pubkey;
+            if (publicKey instanceof NativeECPublicKey) {
+                pubkey = ((NativeECPublicKey) publicKey).getData();
+            } else {
+                pubkey = ECUtil.toX962Uncompressed(publicKey.getW(), ((ECParameterSpec) params).getCurve());
+            }
+            byte[] privkey;
+            if (privateKey instanceof NativeECPrivateKey) {
+                privkey = ((NativeECPrivateKey) privateKey).getData();
+            } else {
+                privkey = ECUtil.toByteArray(privateKey.getS(), ((ECParameterSpec) params).getCurve().getField().getFieldSize());
+            }
+            return generateSecret(pubkey, privkey, (ECParameterSpec) params);
+        }
+
+        abstract byte[] generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params);
+    }
+
+    private abstract static class ExtendedKeyAgreementSpi extends NativeKeyAgreementSpi {
+
+        @Override
+        protected void engineInit(Key key, AlgorithmParameterSpec params, SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {
+            if (!(params instanceof ECParameterSpec || params instanceof ECGenParameterSpec)) {
+                throw new InvalidAlgorithmParameterException();
+            }
+            engineInit(key, random);
+            this.params = params;
+        }
+
+        @Override
+        protected byte[] engineGenerateSecret() throws IllegalStateException {
+            return generateSecret(publicKey, privateKey, params);
+        }
+
+        abstract byte[] generateSecret(ECPublicKey pubkey, ECPrivateKey privkey, AlgorithmParameterSpec params);
+    }
 
 
-    public static class TomCrypt extends NativeKeyAgreementSpi {
+    public static class TomCrypt extends SimpleKeyAgreementSpi {
 
         @Override
         native byte[] generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params);
     }
 
-    public abstract static class Botan extends NativeKeyAgreementSpi {
+    public abstract static class Botan extends SimpleKeyAgreementSpi {
         private String type;
 
         public Botan(String type) {
@@ -138,7 +171,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
         }
     }
 
-    public abstract static class Cryptopp extends NativeKeyAgreementSpi {
+    public abstract static class Cryptopp extends SimpleKeyAgreementSpi {
         private String type;
 
         public Cryptopp(String type) {
@@ -155,7 +188,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
         }
     }
 
-    public abstract static class Openssl extends NativeKeyAgreementSpi {
+    public abstract static class Openssl extends SimpleKeyAgreementSpi {
         private String type;
 
         public Openssl(String type) {
@@ -171,4 +204,39 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
             super("ECDH");
         }
     }
+
+    public abstract static class Mscng extends ExtendedKeyAgreementSpi {
+        private String type;
+
+        public Mscng(String type) {
+            this.type = type;
+        }
+
+        @Override
+        native byte[] generateSecret(ECPublicKey pubkey, ECPrivateKey privkey, AlgorithmParameterSpec params);
+    }
+
+    public static class MscngECDHwithSHA1KDF extends Mscng {
+        public MscngECDHwithSHA1KDF() {
+            super("ECDHwithSHA1KDF");
+        }
+    }
+
+    public static class MscngECDHwithSHA256KDF extends Mscng {
+        public MscngECDHwithSHA256KDF() {
+            super("ECDHwithSHA256KDF");
+        }
+    }
+
+    public static class MscngECDHwithSHA384KDF extends Mscng {
+        public MscngECDHwithSHA384KDF() {
+            super("ECDHwithSHA384KDF");
+        }
+    }
+
+    public static class MscngECDHwithSHA512KDF extends Mscng {
+        public MscngECDHwithSHA512KDF() {
+            super("ECDHwithSHA512KDF");
+        }
+    }
 }