diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-02 09:35:51 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-15 22:12:25 +0200 |
| commit | 6a4f9cd113e7fc0734eb4b62e596488e71961040 (patch) | |
| tree | 5504c89eda12ea5648aad7e440279c0d6b021a4f /crypto/init.c | |
| parent | ae0b6b92038b3f6e3a0e2f354cd900f96bce4d8b (diff) | |
Remove init of MACs from EVP
Now that all our MACs have moved to the default provider, we let it
take over completely
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8877)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/crypto/init.c b/crypto/init.c index d5f0ebd7b7..04fd33087a 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -226,26 +226,6 @@ DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_digests, return 1; } -static CRYPTO_ONCE add_all_macs = CRYPTO_ONCE_STATIC_INIT; -DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_macs) -{ - /* - * OPENSSL_NO_AUTOALGINIT is provided here to prevent at compile time - * pulling in all the macs during static linking - */ -#ifndef OPENSSL_NO_AUTOALGINIT - OSSL_TRACE(INIT, "openssl_add_all_macs_int()\n"); - openssl_add_all_macs_int(); -#endif - return 1; -} - -DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_macs, ossl_init_add_all_macs) -{ - /* Do nothing */ - return 1; -} - static CRYPTO_ONCE add_all_kdfs = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_kdfs) { @@ -558,15 +538,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests)) return 0; - if ((opts & OPENSSL_INIT_NO_ADD_ALL_MACS) - && !RUN_ONCE_ALT(&add_all_macs, ossl_init_no_add_all_macs, - ossl_init_add_all_macs)) - return 0; - - if ((opts & OPENSSL_INIT_ADD_ALL_MACS) - && !RUN_ONCE(&add_all_macs, ossl_init_add_all_macs)) - return 0; - if ((opts & OPENSSL_INIT_NO_ADD_ALL_KDFS) && !RUN_ONCE_ALT(&add_all_kdfs, ossl_init_no_add_all_kdfs, ossl_init_add_all_kdfs)) |