X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fengine%2Feng_all.c;h=7cc05bfe0be2294a8afd1892df2d7edbab850b24;hp=53866b0d69c2d95140607097d27162a07ccf5f66;hb=0c3426da8678d248c2ebfe02c84d6fdab122a21e;hpb=ba2cad19cf78fc32a8494edcf70b7ff20a2facf1;ds=sidebyside

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 53866b0d69..7cc05bfe0b 100644
--- 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();
@@ -92,8 +93,23 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_SUREWARE
 	ENGINE_load_sureware();
 #endif
-#ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-	ENGINE_load_openbsd_dev_crypto();
+#ifndef OPENSSL_NO_HW_4758_CCA
+	ENGINE_load_4758cca();
+#endif
+#endif
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+	ENGINE_load_cryptodev();
 #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