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

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index a3476de555..a5da52e62d 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -59,17 +59,32 @@
 #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
-void OpenSSL_add_all_algorithms(void);
 
 void OpenSSL_add_all_algorithms(void)
 	{
 	OPENSSL_add_all_algorithms_noconf();
 	}
+#endif
 
 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
+# if defined(__OpenBSD__) || defined(__FreeBSD__)
+	ENGINE_setup_bsd_cryptodev();
+# endif
+#endif
 	}