RT3548: Remove unsupported platforms

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

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 80edead3baa024420799009a6a8ce97b1b7d8bea..fa6febfcfd3ab4105b05cf626c01106782023a91 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -61,6 +61,8 @@
 
 void ENGINE_load_builtin_engines(void)
        {
+       /* Some ENGINEs need this */
+       OPENSSL_cpuid_setup();
 #if 0
        /* There's no longer any need for an "openssl" ENGINE unless, one day,
         * it is the *only* way for standard builtin implementations to be be
@@ -68,8 +70,11 @@ void ENGINE_load_builtin_engines(void)
         * *no* builtin implementations). */
        ENGINE_load_openssl();
 #endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
        ENGINE_load_cryptodev();
+#endif
+#ifndef OPENSSL_NO_RDRAND
+       ENGINE_load_rdrand();
 #endif
        ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE
@@ -77,6 +82,8 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_4758_CCA
        ENGINE_load_4758cca();
 #endif
+/*-
+ * These engines have been disabled as they do not currently build
 #ifndef OPENSSL_NO_HW_AEP
        ENGINE_load_aep();
 #endif
@@ -98,6 +105,7 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
        ENGINE_load_ubsec();
 #endif
+*/
 #ifndef OPENSSL_NO_HW_PADLOCK
        ENGINE_load_padlock();
 #endif
@@ -108,13 +116,14 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_GMP
        ENGINE_load_gmp();
 #endif
-#endif
 #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
        ENGINE_load_capi();
 #endif
+#endif
+       ENGINE_register_all_complete();
        }
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 void ENGINE_setup_bsd_cryptodev(void) {
        static int bsd_cryptodev_default_loaded = 0;
        if (!bsd_cryptodev_default_loaded) {