From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Tue, 11 Jan 2022 11:10:35 +0000 (+0100)
Subject: Remove unsafe call to OPENSSL_cpuid_setup
X-Git-Tag: OpenSSL_1_1_1n~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e7098e11581b6b3a4083a1c17889ed817e8ac22;p=thirdparty%2Fopenssl.git

Remove unsafe call to OPENSSL_cpuid_setup

This function is inherently thread-unsafe,
and moreover it is unnecessary here, because
OPENSSL_init_crypto always calls it in a thread-safe way.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17468)
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index b675ed7892e..c570aeda3de 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -12,9 +12,6 @@
 
 void ENGINE_load_builtin_engines(void)
 {
-    /* Some ENGINEs need this */
-    OPENSSL_cpuid_setup();
-
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
 }