summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-02-10 14:42:33 +0100
committerRich Salz <rsalz@openssl.org>2016-02-10 14:45:22 +0100
commitea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6 (patch)
treed0594acae3faf2ef371503ce68140dc2816bda38
parentunified build system: add CHANGES & NEWS (diff)
downloadopenssl-ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6.tar.xz
openssl-ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6.zip
No dynamic-init fix; merge goof.
Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r--crypto/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/init.c b/crypto/init.c
index 5ecd6bae4f..e2f3583b45 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -604,7 +604,6 @@ void OPENSSL_INIT_library_stop(void)
CONF_modules_free();
RAND_cleanup();
base_inited = 0;
- OPENSSL_INIT_ONCE_DYNAMIC_INIT(&base);
}
static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting(