Engine EC_KEY_METHOD functionality.

[openssl.git] / crypto / engine / eng_fat.c

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index e0c8f96f699d20254815987dffff8105377a53a6..79d30bc8f529fa6a501bd156715e8c6330bdcf70 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -80,9 +80,7 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
         return 0;
 #endif
 #ifndef OPENSSL_NO_EC
-    if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
-        return 0;
-    if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
+    if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e))
         return 0;
 #endif
     if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
@@ -109,12 +107,10 @@ static int int_def_cb(const char *alg, int len, void *arg)
         *pflags |= ENGINE_METHOD_RSA;
     else if (strncmp(alg, "DSA", len) == 0)
         *pflags |= ENGINE_METHOD_DSA;
-    else if (strncmp(alg, "ECDH", len) == 0)
-        *pflags |= ENGINE_METHOD_ECDH;
-    else if (strncmp(alg, "ECDSA", len) == 0)
-        *pflags |= ENGINE_METHOD_ECDSA;
     else if (strncmp(alg, "DH", len) == 0)
         *pflags |= ENGINE_METHOD_DH;
+    else if (strncmp(alg, "EC", len) == 0)
+        *pflags |= ENGINE_METHOD_EC;
     else if (strncmp(alg, "RAND", len) == 0)
         *pflags |= ENGINE_METHOD_RAND;
     else if (strncmp(alg, "CIPHERS", len) == 0)
@@ -158,8 +154,7 @@ int ENGINE_register_complete(ENGINE *e)
     ENGINE_register_DH(e);
 #endif
 #ifndef OPENSSL_NO_EC
-    ENGINE_register_ECDH(e);
-    ENGINE_register_ECDSA(e);
+    ENGINE_register_EC(e);
 #endif
     ENGINE_register_RAND(e);
     ENGINE_register_pkey_meths(e);