diff options
| author | Pauli <paul.dale@oracle.com> | 2019-08-21 08:04:27 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-06 19:27:57 +1000 |
| commit | b50ca330cb02cad70bfb11401c47074e8e7d8a48 (patch) | |
| tree | a8af054b57c2976587768d4284067235bf55f148 /crypto/init.c | |
| parent | ce3b1bb481d0e079c6f06963e91c285c7cbdb4df (diff) | |
Remove old KDF initialisation
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9662)
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 d4da7b27e3..36c6333877 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -225,26 +225,6 @@ DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_digests, return 1; } -static CRYPTO_ONCE add_all_kdfs = CRYPTO_ONCE_STATIC_INIT; -DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_kdfs) -{ - /* - * 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_kdfs_int()\n"); - openssl_add_all_kdfs_int(); -#endif - return 1; -} - -DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_kdfs, ossl_init_add_all_kdfs) -{ - /* Do nothing */ - return 1; -} - static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT; static int config_inited = 0; static const OPENSSL_INIT_SETTINGS *conf_settings = NULL; @@ -537,15 +517,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_KDFS) - && !RUN_ONCE_ALT(&add_all_kdfs, ossl_init_no_add_all_kdfs, - ossl_init_add_all_kdfs)) - return 0; - - if ((opts & OPENSSL_INIT_ADD_ALL_KDFS) - && !RUN_ONCE(&add_all_kdfs, ossl_init_add_all_kdfs)) - return 0; - if ((opts & OPENSSL_INIT_ATFORK) && !openssl_init_fork_handlers()) return 0; |