From db6c6c3df296558d00fd21ae1a29a7523d884b55 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 30 Jan 2019 19:21:42 +0100 Subject: [PATCH] Reuse already defined macros instead of duplicity the code. CLA: trivial Signed-off-by: Petr Vorel Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8127) (cherry picked from commit c4734493d7da404b1747195a805c8d536dbe6910) --- include/openssl/evp.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/openssl/evp.h b/include/openssl/evp.h index cfc33f6a8c..e2416724e6 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -945,14 +945,9 @@ const EVP_CIPHER *EVP_sm4_ctr(void); | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) # ifdef OPENSSL_LOAD_CONF -# define OpenSSL_add_all_algorithms() \ - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ - | OPENSSL_INIT_ADD_ALL_DIGESTS \ - | OPENSSL_INIT_LOAD_CONFIG, NULL) +# define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_conf() # else -# define OpenSSL_add_all_algorithms() \ - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ - | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) +# define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_noconf() # endif # define OpenSSL_add_all_ciphers() \ -- 2.25.1