Omit padding in RC4_KEY on IA-64. The idea behind padding was to reserve

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

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 7ebe25ca6c2cd6661c33eae03bf0c4d2bf1b2e4e..86b2f9a1c33b3bfc931b35937fed7b3a711d81cb 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)
@@ -70,24 +69,52 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_openssl();
 #endif
        ENGINE_load_dynamic();
+#ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_4758_CCA
+       ENGINE_load_4758cca();
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+       ENGINE_load_aep();
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+       ENGINE_load_atalla();
+#endif
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();
 #endif
 #ifndef OPENSSL_NO_HW_NCIPHER
        ENGINE_load_chil();
 #endif
-#ifndef OPENSSL_NO_HW_ATALLA
-       ENGINE_load_atalla();
-#endif
 #ifndef OPENSSL_NO_HW_NURON
        ENGINE_load_nuron();
 #endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+       ENGINE_load_sureware();
+#endif
 #ifndef OPENSSL_NO_HW_UBSEC
        ENGINE_load_ubsec();
 #endif
-#ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-       ENGINE_load_openbsd_dev_crypto();
+#ifndef OPENSSL_NO_HW_PADLOCK
+       ENGINE_load_padlock();
+#endif
+#endif
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+       ENGINE_load_cryptodev();
+#endif
+#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
+       ENGINE_load_gmp();
 #endif
 #endif
        }
+
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+void ENGINE_setup_bsd_cryptodev(void) {
+       static int bsd_cryptodev_default_loaded = 0;
+       if (!bsd_cryptodev_default_loaded) {
+               ENGINE_load_cryptodev();
+               ENGINE_register_all_complete();
+       }
+       bsd_cryptodev_default_loaded=1;
+}
+#endif