From 65a1e917a6be8c5a776a593b7bed9a52c950c71b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 2 May 2019 13:42:31 +0100 Subject: [PATCH] Add some TODO notes into init.c We should be seeking to move the OPENSSL_init_crypto and OPENSSL_cleanup processing into OPENSSL_CTX instead. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/8857) --- crypto/init.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/crypto/init.c b/crypto/init.c index aa6f4b7125..d2048ea6cd 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -468,6 +468,11 @@ void OPENSSL_cleanup(void) OPENSSL_INIT_STOP *currhandler, *lasthandler; CRYPTO_THREAD_LOCAL key; + /* + * TODO(3.0): This function needs looking at with a view to moving most/all + * of this into onfree handlers in OPENSSL_CTX. + */ + /* If we've not been inited then no need to deinit */ if (!base_inited) return; @@ -579,6 +584,11 @@ void OPENSSL_cleanup(void) */ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) { + /* + * TODO(3.0): This function needs looking at with a view to moving most/all + * of this into OPENSSL_CTX. + */ + if (stopped) { if (!(opts & OPENSSL_INIT_BASE_ONLY)) CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL); -- 2.25.1