[openssl] OpenSSL_1_1_1-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_1-stable has been updated
       via  5e7098e11581b6b3a4083a1c17889ed817e8ac22 (commit)
      from  f4942134815f95845706993c15ca7e4fd6e44627 (commit)


- Log -----------------------------------------------------------------
commit 5e7098e11581b6b3a4083a1c17889ed817e8ac22
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Jan 11 12:10:35 2022 +0100

    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 at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17468)

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_all.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index b675ed7892..c570aeda3d 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);
 }