Update from HEAD.

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

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 64ec2db901fceafde436937d61e885ce427cb805..d29cd57dc2f1abb93b147240126c49150a42075f 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -56,8 +56,7 @@
  *
  */
 
-#include <openssl/err.h>
-#include <openssl/engine.h>
+#include "cryptlib.h"
 #include "eng_int.h"
 
 void ENGINE_load_builtin_engines(void)
@@ -68,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
@@ -97,11 +99,16 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_ubsec();
 #endif
 #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_USE_GMP) && !defined(OPENSSL_NO_HW_GMP)
-       ENGINE_load_gmp();
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+       ENGINE_load_capi();
 #endif
 #endif
        }