Step 11a of move of engines: Time to make the changes to support

automatic load of dynamic engines.  Unless we don't have shared
library support, do not try to load any "built-in" engines except for
cryptodev.

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index e4d48dae85445bf1f9e05982451f82dd828f33f0..9b0e0bc92ed8ff6ce6439c783237fcd156b981b2 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -70,6 +70,7 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_openssl();
 #endif
        ENGINE_load_dynamic();
        ENGINE_load_openssl();
 #endif
        ENGINE_load_dynamic();

+#ifdef OPENSSL_NO_DYNAMIC_ENGINE

 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();


@@ -95,6 +96,7 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_4758_CCA
        ENGINE_load_4758cca();
 #endif
 #ifndef OPENSSL_NO_HW_4758_CCA
        ENGINE_load_4758cca();
 #endif

+#endif

 #ifdef __OpenBSD__
        ENGINE_load_cryptodev();
 #endif
 #ifdef __OpenBSD__
        ENGINE_load_cryptodev();
 #endif