The branch master has been updated
via e58d91027ad0132289cae5c9960a68f5750ba0ee (commit)
via a4d8bcf1f2a209233fd687694d714880ee510d2d (commit)
via 3e19b07f140acd6d01d551b3bd1303ac55738d28 (commit)
from ad839325e13fe7541d248a88d6cf3556787b0e02 (commit)
- Log -----------------------------------------------------------------
commit e58d91027ad0132289cae5c9960a68f5750ba0ee
Author: Richard Levitte <[email protected]>
Date: Tue Mar 15 15:30:43 2016 +0100
Cygwin configs were missing thread_scheme settings, add them
Reviewed-by: Matt Caswell <[email protected]>
commit a4d8bcf1f2a209233fd687694d714880ee510d2d
Author: Richard Levitte <[email protected]>
Date: Tue Mar 15 14:06:34 2016 +0100
Small typo
OPENSSL_INIT_ONCE and OPENSSL_INIT_ONCE_STATIC_INIT are really
CRYPTO_ONCE and CRYPTO_ONCE_STATIC_INIT.
Reviewed-by: Rich Salz <[email protected]>
commit 3e19b07f140acd6d01d551b3bd1303ac55738d28
Author: Richard Levitte <[email protected]>
Date: Tue Mar 15 14:05:35 2016 +0100
static-engine is no longer an internal keyword, remove it from %disabled
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 2 ++
Configure | 1 -
crypto/init.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 6c43772..53ba040 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1455,6 +1455,7 @@ sub vc_wince_info {
release => "-O3 -fomit-frame-pointer"),
sys_id => "CYGWIN",
bn_ops => "BN_LLONG",
+ thread_scheme => "pthread",
perlasm_scheme => "coff",
dso_scheme => "dlfcn",
shared_target => "cygwin-shared",
@@ -1470,6 +1471,7 @@ sub vc_wince_info {
release => "-O3"),
sys_id => "CYGWIN",
bn_ops => "SIXTY_FOUR_BIT_LONG",
+ thread_scheme => "pthread",
perlasm_scheme => "mingw64",
dso_scheme => "dlfcn",
shared_target => "cygwin-shared",
diff --git a/Configure b/Configure
index c5e3184..3751067 100755
--- a/Configure
+++ b/Configure
@@ -340,7 +340,6 @@ our %disabled = ( # "what" => "comment"
"ssl-trace" => "default",
"ssl3" => "default",
"ssl3-method" => "default",
- "static-engine" => "default",
"unit-test" => "default",
"weak-ssl-ciphers" => "default",
"zlib" => "default",
diff --git a/crypto/init.c b/crypto/init.c
index 8cf7271..b7e0235 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -311,7 +311,7 @@ static void ossl_init_engine_dasync(void)
engine_load_dasync_internal();
}
# if !defined(OPENSSL_NO_AFALGENG)
-static OPENSSL_INIT_ONCE engine_afalg = OPENSSL_INIT_ONCE_STATIC_INIT;
+static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;
static void ossl_init_engine_afalg(void)
{
# ifdef OPENSSL_INIT_DEBUG
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
