X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fc_all.c;h=a5da52e62d8b03ef8625fe39eb64df4f59faf97e;hp=879d84ae79baa3f991557a4c708356cc560a4319;hb=8789af8db8a4b16067d2f11236ecfa4e2bc6a1b3;hpb=8d570498a268acff0c311c1149f872bf84827583

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 879d84ae79..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,6 +74,12 @@ 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();
 #ifndef OPENSSL_NO_ENGINE