diff options
author | jsing <> | 2023-07-24 10:24:58 +0000 |
---|---|---|
committer | jsing <> | 2023-07-24 10:24:58 +0000 |
commit | 5de20ae51daf331d14b7a3a5c84bb087bfce99cf (patch) | |
tree | 217f94c0425d7c03fe8a6c6e85b9b7358e8c7892 | |
parent | 8b06006d10486de29fa06b2d48e75fc2aaed17eb (diff) | |
download | openbsd-5de20ae51daf331d14b7a3a5c84bb087bfce99cf.tar.gz openbsd-5de20ae51daf331d14b7a3a5c84bb087bfce99cf.tar.bz2 openbsd-5de20ae51daf331d14b7a3a5c84bb087bfce99cf.zip |
Remove OPENSSL_cpuid_setup() call from OPENSSL_add_all_algorithms_noconf()
OPENSSL_cpuid_setup() used to need to be called from
OPENSSL_add_all_algorithms(), as that was the main entry point. These days
we do on demand initialisation and there are various paths that lead to
OPENSSL_init_crypto() being called, which in turn calls
OPENSSL_cpuid_setup().
ok tb@
-rw-r--r-- | src/lib/libcrypto/evp/c_all.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c index 10e35dd7ab..871abe6e9a 100644 --- a/src/lib/libcrypto/evp/c_all.c +++ b/src/lib/libcrypto/evp/c_all.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: c_all.c,v 1.31 2023/07/07 19:37:53 beck Exp $ */ | 1 | /* $OpenBSD: c_all.c,v 1.32 2023/07/24 10:24:58 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -317,7 +317,6 @@ OpenSSL_add_all_digests(void) | |||
317 | void | 317 | void |
318 | OPENSSL_add_all_algorithms_noconf(void) | 318 | OPENSSL_add_all_algorithms_noconf(void) |
319 | { | 319 | { |
320 | OPENSSL_cpuid_setup(); | ||
321 | OpenSSL_add_all_ciphers(); | 320 | OpenSSL_add_all_ciphers(); |
322 | OpenSSL_add_all_digests(); | 321 | OpenSSL_add_all_digests(); |
323 | } | 322 | } |