From: Petr Vorel <petr.vorel@gmail.com>
Date: Wed, 30 Jan 2019 18:21:42 +0000 (+0100)
Subject: Reuse already defined macros
X-Git-Tag: openssl-3.0.0-alpha1~2599
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4734493d7da404b1747195a805c8d536dbe6910;p=oweals%2Fopenssl.git

Reuse already defined macros

instead of duplicity the code.

CLA: trivial

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8127)
---

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 9f1dbd4b8b..940a4b11aa 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -958,14 +958,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() \