Merge branch 'devel'

1 files changed, 39 insertions, 15 deletions

diff --git a/src/cz/crcs/ectester/standalone/consts/KeyAgreementIdent.java b/src/cz/crcs/ectester/standalone/consts/KeyAgreementIdent.java
index 0e4d311..94e8c84 100644
--- a/src/cz/crcs/ectester/standalone/consts/KeyAgreementIdent.java
+++ b/src/cz/crcs/ectester/standalone/consts/KeyAgreementIdent.java
@@ -10,6 +10,8 @@ import java.util.List;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class KeyAgreementIdent extends Ident {
+    private boolean requiresKeyAlgo;
+
     private static final List<KeyAgreementIdent> ALL = new LinkedList<>();
 
     static {
@@ -18,23 +20,36 @@ public class KeyAgreementIdent extends Ident {
         ALL.add(new KeyAgreementIdent("ECDH"));
         ALL.add(new KeyAgreementIdent("ECDHC", "ECCDH"));
         // ECDH and ECDHC with SHA as KDF, OIDs from RFC 3278
-        ALL.add(new KeyAgreementIdent("ECDHwithSHA1KDF", "1.3.133.16.840.63.0.2"));
-        ALL.add(new KeyAgreementIdent("ECCDHwithSHA1KDF", "1.3.133.16.840.63.0.3"));
-        ALL.add(new KeyAgreementIdent("ECDHwithSHA224KDF", "1.3.132.1.11.0"));
-        ALL.add(new KeyAgreementIdent("ECCDHwithSHA224KDF", "1.3.132.1.14.0"));
-        ALL.add(new KeyAgreementIdent("ECDHwithSHA256KDF", "1.3.132.1.11.1"));
-        ALL.add(new KeyAgreementIdent("ECCDHwithSHA256KDF", "1.3.132.1.14.1"));
-        ALL.add(new KeyAgreementIdent("ECDHwithSHA384KDF", "1.3.132.1.11.2"));
-        ALL.add(new KeyAgreementIdent("ECCDHwithSHA384KDF", "1.3.132.1.14.2"));
-        ALL.add(new KeyAgreementIdent("ECDHwithSHA512KDF", "1.3.132.1.11.3"));
-        ALL.add(new KeyAgreementIdent("ECCDHwithSHA512KDF", "1.3.132.1.14.3"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA1KDF", true, "1.3.133.16.840.63.0.2"));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA1KDF", true, "1.3.133.16.840.63.0.3"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA224KDF",true,  "1.3.132.1.11.0"));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA224KDF", true, "1.3.132.1.14.0"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA256KDF", true, "1.3.132.1.11.1"));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA256KDF", true, "1.3.132.1.14.1"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA384KDF", true, "1.3.132.1.11.2"));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA384KDF", true, "1.3.132.1.14.2"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA512KDF", true, "1.3.132.1.11.3"));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA512KDF", true, "1.3.132.1.14.3"));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA1CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA1CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA256CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA256CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA384CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA384CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECDHwithSHA512CKDF", true));
+        ALL.add(new KeyAgreementIdent("ECCDHwithSHA512CKDF", true));
         // ECMQV - Disable for now as it needs diferent params(too different from DH)
         //ALL.add(new KeyAgreementIdent("ECMQV"));
-        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA1CKDF", "1.3.133.16.840.63.0.16"));
-        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA224CKDF", "1.3.132.1.15.0"));
-        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA256CKDF", "1.3.132.1.15.1"));
-        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA384CKDF", "1.3.132.1.15.2"));
-        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA512CKDF", "1.3.132.1.15.3"));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA1KDF", true));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA224KDF", true));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA256KDF", true));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA354KDF", true));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA512KDF", true));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA1CKDF", true, "1.3.133.16.840.63.0.16"));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA224CKDF", true, "1.3.132.1.15.0"));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA256CKDF", true, "1.3.132.1.15.1"));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA384CKDF", true, "1.3.132.1.15.2"));
+        //ALL.add(new KeyAgreementIdent("ECMQVwithSHA512CKDF", true, "1.3.132.1.15.3"));
         // ECVKO - Disable for now as it needs diferent params(too different from DH)
         //ALL.add(new KeyAgreementIdent("ECVKO", "ECGOST3410", "1.2.643.2.2.19", "GOST-3410-2001", "1.2.643.2.2.96"));
         //ALL.add(new KeyAgreementIdent("ECVKO256", "ECGOST3410-2012-256", "1.2.643.7.1.1.6.1", "1.2.643.7.1.1.1.1"));
@@ -54,6 +69,15 @@ public class KeyAgreementIdent extends Ident {
         super(name, aliases);
     }
 
+    private KeyAgreementIdent(String name, boolean requiresKeyAlgo, String... aliases) {
+        this(name, aliases);
+        this.requiresKeyAlgo = requiresKeyAlgo;
+    }
+
+    public boolean requiresKeyAlgo() {
+        return requiresKeyAlgo;
+    }
+
     public KeyAgreement getInstance(Provider provider) throws NoSuchAlgorithmException {
         KeyAgreement instance = getInstance((algorithm, provider1) -> {
             try {