wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some TODO notes into init.c

Browse source 
We should be seeking to move the OPENSSL_init_crypto and OPENSSL_cleanup
processing into OPENSSL_CTX instead.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8857)
This commit is contained in:
Matt Caswell 2019-05-02 13:42:31 +01:00
parent 1aedc35fd6
commit 65a1e917a6
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crypto/init.c
View file

@ -468,6 +468,11 @@ void OPENSSL_cleanup(void)
OPENSSL_INIT_STOP *currhandler, *lasthandler; OPENSSL_INIT_STOP *currhandler, *lasthandler;
CRYPTO_THREAD_LOCAL key; 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 we've not been inited then no need to deinit */
if (!base_inited) if (!base_inited)
return; return;
@ -579,6 +584,11 @@ void OPENSSL_cleanup(void)
*/ */
int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) 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 (stopped) {
if (!(opts & OPENSSL_INIT_BASE_ONLY)) if (!(opts & OPENSSL_INIT_BASE_ONLY))
CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL); CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL);