diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 12:55:50 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:59:53 +0100 |
| commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
| tree | e87a5b512d7869cb6a500ecc74b706281be762cf /crypto/init.c | |
| parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
Rename OPENSSL_CTX prefix to OSSL_LIB_CTX
Many of the new types introduced by OpenSSL 3.0 have an OSSL_ prefix,
e.g., OSSL_CALLBACK, OSSL_PARAM, OSSL_ALGORITHM, OSSL_SERIALIZER.
The OPENSSL_CTX type stands out a little by using a different prefix.
For consistency reasons, this type is renamed to OSSL_LIB_CTX.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12621)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/init.c b/crypto/init.c index fec178c389..cfd4eab9ed 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -339,7 +339,7 @@ void OPENSSL_cleanup(void) /* * TODO(3.0): This function needs looking at with a view to moving most/all - * of this into onfree handlers in OPENSSL_CTX. + * of this into onfree handlers in OSSL_LIB_CTX. */ /* If we've not been inited then no need to deinit */ @@ -396,7 +396,7 @@ void OPENSSL_cleanup(void) * - rand_cleanup_int could call an ENGINE's RAND cleanup function so * must be called before engine_cleanup_int() * - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up - * before the ex data handlers are wiped during default openssl_ctx deinit. + * before the ex data handlers are wiped during default ossl_lib_ctx deinit. * - conf_modules_free_int() can end up in ENGINE code so must be called * before engine_cleanup_int() * - ENGINEs and additional EVP algorithms might use added OIDs names so @@ -418,8 +418,8 @@ void OPENSSL_cleanup(void) ossl_store_cleanup_int(); #endif - OSSL_TRACE(INIT, "OPENSSL_cleanup: openssl_ctx_default_deinit()\n"); - openssl_ctx_default_deinit(); + OSSL_TRACE(INIT, "OPENSSL_cleanup: ossl_lib_ctx_default_deinit()\n"); + ossl_lib_ctx_default_deinit(); ossl_cleanup_thread(); @@ -458,7 +458,7 @@ 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. + * of this into OSSL_LIB_CTX. */ if (stopped) { |