X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fc_all.c;h=766c4cecdf7e4bbea6ab9ed502ef9d13347c41a2;hp=1bd54d791e3a293db7642bbc59804134d66af07e;hb=fbe2e28911070a8556ad05bdfd6b6871d4a82244;hpb=293d5082c75b72ae56cfac02deb5dd6357130c2d

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 1bd54d791e..766c4cecdf 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -59,6 +59,9 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
 
 #if 0
 #undef OpenSSL_add_all_algorithms
@@ -71,9 +74,17 @@ void OpenSSL_add_all_algorithms(void)
 
 void OPENSSL_add_all_algorithms_noconf(void)
 	{
+	/*
+	 * For the moment OPENSSL_cpuid_setup does something
+	 * only on IA-32, but we reserve the option for all
+	 * platforms...
+	 */
+	OPENSSL_cpuid_setup();
 	OpenSSL_add_all_ciphers();
 	OpenSSL_add_all_digests();
-#ifdef __OpenBSD__
-	ENGINE_setup_openbsd();
+#ifndef OPENSSL_NO_ENGINE
+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+	ENGINE_setup_bsd_cryptodev();
+# endif
 #endif
 	}