Make sure to implement the cryptodev engine only when /dev/crypto exists.

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

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 7ebe25ca6c2cd6661c33eae03bf0c4d2bf1b2e4e..6bb7e93bb2f9a7b0bd5b984518d444895c67acda 100644 (file)
--- 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();
+#ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();
@@ -86,8 +87,29 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
        ENGINE_load_ubsec();
 #endif
-#ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-       ENGINE_load_openbsd_dev_crypto();
+#ifndef OPENSSL_NO_HW_AEP
+       ENGINE_load_aep();
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+       ENGINE_load_sureware();
+#endif
+#ifndef OPENSSL_NO_HW_4758_CCA
+       ENGINE_load_4758cca();
+#endif
+#endif
+#ifdef __OpenBSD__
+       ENGINE_load_cryptodev();
 #endif
 #endif
        }
+
+#ifdef __OpenBSD__
+void ENGINE_setup_openbsd(void) {
+       static int openbsd_default_loaded = 0;
+       if (!openbsd_default_loaded) {
+               ENGINE_load_cryptodev();
+               ENGINE_register_all_complete();
+       }
+       openbsd_default_loaded=1;
+}
+#endif