From: jsing <jsing@openbsd.org>
Date: Mon, 24 Jul 2023 10:24:58 +0000 (+0000)
Subject: Remove OPENSSL_cpuid_setup() call from OPENSSL_add_all_algorithms_noconf()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b2368ebdada0d6d022d20bbe96eab69dbc406e5a;p=openbsd

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@
---

diff --git a/lib/libcrypto/evp/c_all.c b/lib/libcrypto/evp/c_all.c
index 10e35dd7abc..871abe6e9a1 100644
--- a/lib/libcrypto/evp/c_all.c
+++ b/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_all.c,v 1.31 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: c_all.c,v 1.32 2023/07/24 10:24:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -317,7 +317,6 @@ OpenSSL_add_all_digests(void)
 void
 OPENSSL_add_all_algorithms_noconf(void)
 {
-	OPENSSL_cpuid_setup();
 	OpenSSL_add_all_ciphers();
 	OpenSSL_add_all_digests();
 }