summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2007-01-04 22:55:25 +0000
committerAndy Polyakov <appro@openssl.org>2007-01-04 22:55:25 +0000
commit78d4d87e39638a6ca48b3e804d341cf0daf41f64 (patch)
tree75b8bce830d99babc2057a25ee48398ea4a96ab4 /crypto/engine
parent62116332737de598c639b08e79411928d42ff452 (diff)
Initialize padlock in shared build.
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_all.c12
1 files changed, 7 insertions, 5 deletions
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
@@ -68,6 +68,9 @@ void ENGINE_load_builtin_engines(void)
#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
#ifndef OPENSSL_NO_HW
@@ -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
}