diff options
| author | Petr Vorel <petr.vorel@gmail.com> | 2019-01-30 19:21:42 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-01-31 09:40:05 +1000 |
| commit | db6c6c3df296558d00fd21ae1a29a7523d884b55 (patch) | |
| tree | 6d9efbe5a37f6b4f5e34063fdc8e08c0c0b1944d /include | |
| parent | fea9f34a2e9c018430385c9073161b4daa484843 (diff) | |
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)
(cherry picked from commit c4734493d7da404b1747195a805c8d536dbe6910)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 9 |
1 files 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() \ |