From d6d4e206cd692584735252f0a21af1b42608bc28 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 16 May 2014 14:24:36 +0000 Subject: When OPENSSL_LOAD_CONF was added it ended up with more #if 0 code, more #ifdefs and a new source file that contains a single function. Nuke the #if 0 code that is now a macro and move the single function in evp_acnf.c to c_all.c, which is where the other code lives. While here, tidy evp.h slightly, remove an unnecessary #ifdef __OpenBSD__ and nuke a comment that is now a lie. ok miod@ --- src/lib/libcrypto/evp/c_all.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'src/lib/libcrypto/evp/c_all.c') diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c index 0596484742..251a8797df 100644 --- a/src/lib/libcrypto/evp/c_all.c +++ b/src/lib/libcrypto/evp/c_all.c @@ -57,36 +57,30 @@ */ #include -#include "cryptlib.h" + +#include #include + #ifndef OPENSSL_NO_ENGINE #include #endif -#if 0 -#undef OpenSSL_add_all_algorithms - -void -OpenSSL_add_all_algorithms(void) -{ - OPENSSL_add_all_algorithms_noconf(); -} -#endif +#include "cryptlib.h" 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__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); -# endif #endif } + +void +OPENSSL_add_all_algorithms_conf(void) +{ + OPENSSL_add_all_algorithms_noconf(); + OPENSSL_config(NULL); +} -- cgit v1.2.3-55-g6feb