summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_init.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-02-09 11:52:40 -0500
committerRich Salz <rsalz@openssl.org>2016-02-10 09:37:03 -0500
commitf672aee49450e03e7b1a26c8701d0be720e9ae0e (patch)
tree3f0eacb640d461102a8962d3a663a6e17df70fd6 /ssl/ssl_init.c
parentea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6 (diff)
Rename INIT funtions, deprecate old ones.
Man, there were a lot of renamings :) Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_init.c')
-rw-r--r--ssl/ssl_init.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 112def1f43..67e431941a 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -234,7 +234,7 @@ static void ossl_init_ssl_base(void)
* We ignore an error return here. Not much we can do - but not that bad
* either. We can still safely continue.
*/
- OPENSSL_INIT_register_stop_handler(ssl_library_stop);
+ OPENSSL_atexit(ssl_library_stop);
ssl_base_inited = 1;
}
@@ -299,14 +299,13 @@ static void ssl_library_stop(void)
* called prior to any threads making calls to any OpenSSL functions,
* i.e. passing a non-null settings value is assumed to be single-threaded.
*/
-void OPENSSL_INIT_ssl_library_start(uint64_t opts,
- const OPENSSL_INIT_SETTINGS *settings)
+void OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
{
/* XXX TODO WARNING To be updated to return a value not assert. */
assert(!stopped);
- OPENSSL_INIT_crypto_library_start(opts | OPENSSL_INIT_ADD_ALL_CIPHERS
- | OPENSSL_INIT_ADD_ALL_DIGESTS, settings);
+ OPENSSL_init_crypto(opts | OPENSSL_INIT_ADD_ALL_CIPHERS
+ | OPENSSL_INIT_ADD_ALL_DIGESTS, settings);
ossl_init_once_run(&ssl_base, ossl_init_ssl_base);