diff options
Diffstat (limited to 'lib/libcrypto/evp/c_all.c')
| -rw-r--r-- | lib/libcrypto/evp/c_all.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/lib/libcrypto/evp/c_all.c b/lib/libcrypto/evp/c_all.c index 0596484742e..251a8797df9 100644 --- a/lib/libcrypto/evp/c_all.c +++ b/lib/libcrypto/evp/c_all.c @@ -57,36 +57,30 @@ */ #include <stdio.h> -#include "cryptlib.h" + +#include <openssl/conf.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) -{ - 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); +} |