Add AES SPARC T4 module from master.

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

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 41d511a033725b6c88819a63bf64045d5906847e..789b8d57e58bbccd019ec24ebb3e55f676d5499d 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -89,7 +89,11 @@ 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))
+       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;
        }
@@ -118,7 +122,12 @@ static int int_def_cb(const char *alg, int len, void *arg)
        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;
@@ -167,6 +176,7 @@ int ENGINE_register_all_complete(void)
        ENGINE *e;
 
        for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
-               ENGINE_register_complete(e);
+               if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL))
+                       ENGINE_register_complete(e);
        return 1;
        }