|
@@ -21,7 +21,7 @@ diff --git a/crypto/engine/build.info b/crypto/engine/build.info
|
|
|
diff --git a/crypto/init.c b/crypto/init.c
|
|
|
--- a/crypto/init.c
|
|
|
+++ b/crypto/init.c
|
|
|
-@@ -329,18 +329,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
|
|
|
+@@ -328,18 +328,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
|
|
|
engine_load_openssl_int();
|
|
|
return 1;
|
|
|
}
|
|
@@ -40,7 +40,7 @@ diff --git a/crypto/init.c b/crypto/init.c
|
|
|
|
|
|
# ifndef OPENSSL_NO_RDRAND
|
|
|
static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT;
|
|
|
-@@ -365,6 +353,18 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic)
|
|
|
+@@ -364,6 +352,18 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic)
|
|
|
return 1;
|
|
|
}
|
|
|
# ifndef OPENSSL_NO_STATIC_ENGINE
|
|
@@ -59,7 +59,7 @@ diff --git a/crypto/init.c b/crypto/init.c
|
|
|
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
|
|
|
static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT;
|
|
|
DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock)
|
|
|
-@@ -713,11 +713,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
|
|
|
+@@ -704,11 +704,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
|
|
|
if ((opts & OPENSSL_INIT_ENGINE_OPENSSL)
|
|
|
&& !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl))
|
|
|
return 0;
|
|
@@ -71,7 +71,7 @@ diff --git a/crypto/init.c b/crypto/init.c
|
|
|
# ifndef OPENSSL_NO_RDRAND
|
|
|
if ((opts & OPENSSL_INIT_ENGINE_RDRAND)
|
|
|
&& !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand))
|
|
|
-@@ -727,6 +722,11 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
|
|
|
+@@ -718,6 +713,11 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
|
|
|
&& !RUN_ONCE(&engine_dynamic, ossl_init_engine_dynamic))
|
|
|
return 0;
|
|
|
# ifndef OPENSSL_NO_STATIC_ENGINE
|