From: Andy Polyakov <appro@openssl.org>
Date: Thu, 4 Jan 2007 22:55:25 +0000 (+0000)
Subject: Initialize padlock in shared build.
X-Git-Tag: OpenSSL_0_9_8e~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78d4d87e39638a6ca48b3e804d341cf0daf41f64;p=oweals%2Fopenssl.git

Initialize padlock in shared build.
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 86b2f9a1c3..8599046717 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -67,6 +67,9 @@ void ENGINE_load_builtin_engines(void)
 	 * *no* builtin implementations). */
 #if 0
 	ENGINE_load_openssl();
+#endif
+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
+	ENGINE_load_padlock();
 #endif
 	ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE
@@ -95,16 +98,15 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
 	ENGINE_load_ubsec();
 #endif
-#ifndef OPENSSL_NO_HW_PADLOCK
-	ENGINE_load_padlock();
+#endif
+#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
+	ENGINE_load_gmp();
 #endif
 #endif
+#ifndef OPENSSL_NO_HW
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	ENGINE_load_cryptodev();
 #endif
-#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
-	ENGINE_load_gmp();
-#endif
 #endif
 	}