From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Oct 2002 18:42:54 +0000 (+0000)
Subject: Step 11a of move of engines: Time to make the changes to support
X-Git-Tag: OpenSSL_0_9_7-beta4~109^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6ac3309c74e57c9614ca94e9dc2a4300ac35d11d;p=oweals%2Fopenssl.git

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 e4d48dae85..9b0e0bc92e 100644
--- 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();
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 #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
+#endif
 #ifdef __OpenBSD__
 	ENGINE_load_cryptodev();
 #endif