eng_aesni.c: win32 fix.

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

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 27c1662f6254d96986b25da8079b45db1341059d..db66e623508f838ba585d4c909f18509710bb30c 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -89,6 +89,12 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
 #endif
        if((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
                return 0;
+       if((flags & ENGINE_METHOD_PKEY_METHS)
+                               && !ENGINE_set_default_pkey_meths(e))
+               return 0;
+       if((flags & ENGINE_METHOD_PKEY_ASN1_METHS)
+                               && !ENGINE_set_default_pkey_asn1_meths(e))
+               return 0;
        return 1;
        }
 
@@ -115,6 +121,13 @@ static int int_def_cb(const char *alg, int len, void *arg)
                *pflags |= ENGINE_METHOD_CIPHERS;
        else if (!strncmp(alg, "DIGESTS", len))
                *pflags |= ENGINE_METHOD_DIGESTS;
+       else if (!strncmp(alg, "PKEY", len))
+               *pflags |=
+                       ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
+       else if (!strncmp(alg, "PKEY_CRYPTO", len))
+               *pflags |= ENGINE_METHOD_PKEY_METHS;
+       else if (!strncmp(alg, "PKEY_ASN1", len))
+               *pflags |= ENGINE_METHOD_PKEY_ASN1_METHS;
        else
                return 0;
        return 1;
@@ -154,6 +167,7 @@ int ENGINE_register_complete(ENGINE *e)
        ENGINE_register_ECDSA(e);
 #endif
        ENGINE_register_RAND(e);
+       ENGINE_register_pkey_meths(e);
        return 1;
        }