diff options
| author | Matt Caswell <matt@openssl.org> | 2019-05-02 13:42:31 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-05-02 22:42:09 +0100 |
| commit | 65a1e917a6be8c5a776a593b7bed9a52c950c71b (patch) | |
| tree | 294f3ff63071846d074caa4e9471a3fa1a91535c /crypto/init.c | |
| parent | 1aedc35fd6c2f40f269c88b2f7d5a617172b47c5 (diff) | |
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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8857)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 10 |
1 files changed, 10 insertions, 0 deletions
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); |