X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fc_all.c;h=a5da52e62d8b03ef8625fe39eb64df4f59faf97e;hb=2c5f3606d1dd86d5ca79bf169d25b366406d196f;hp=19737f39f634d35674b1040f4149e31d3da56ac8;hpb=33cc07f79acf91dfbe4970e94665c53f42c89112;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 19737f39f6..a5da52e62d 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -59,7 +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
@@ -72,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();
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#ifndef OPENSSL_NO_ENGINE
+# if defined(__OpenBSD__) || defined(__FreeBSD__)
 	ENGINE_setup_bsd_cryptodev();
+# endif
 #endif
 	}