[openssl-commits] [openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  c4734493d7da404b1747195a805c8d536dbe6910 (commit)
      from  a97faad76a1be22eadd6c1a39972ad5e095d9e80 (commit)


- Log -----------------------------------------------------------------
commit c4734493d7da404b1747195a805c8d536dbe6910
Author: Petr Vorel <petr.vorel at gmail.com>
Date:   Wed Jan 30 19:21:42 2019 +0100

    Reuse already defined macros
    
    instead of duplicity the code.
    
    CLA: trivial
    
    Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8127)

-----------------------------------------------------------------------

Summary of changes:
 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 9f1dbd4..940a4b1 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() \