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 /providers/legacyprov.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 'providers/legacyprov.c')
| -rw-r--r-- | providers/legacyprov.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/providers/legacyprov.c b/providers/legacyprov.c index 2085f4d4b3..19cbf2cf25 100644 --- a/providers/legacyprov.c +++ b/providers/legacyprov.c @@ -161,7 +161,7 @@ static const OSSL_ALGORITHM *legacy_query(void *provctx, int operation_id, static void legacy_teardown(void *provctx) { - OPENSSL_CTX_free(PROV_LIBRARY_CONTEXT_OF(provctx)); + OSSL_LIB_CTX_free(PROV_LIBRARY_CONTEXT_OF(provctx)); ossl_prov_ctx_free(provctx); } @@ -180,7 +180,7 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, void **provctx) { OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL; - OPENSSL_CTX *libctx = NULL; + OSSL_LIB_CTX *libctx = NULL; for (; in->function_id != 0; in++) { switch (in->function_id) { @@ -203,8 +203,8 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, return 0; if ((*provctx = ossl_prov_ctx_new()) == NULL - || (libctx = OPENSSL_CTX_new()) == NULL) { - OPENSSL_CTX_free(libctx); + || (libctx = OSSL_LIB_CTX_new()) == NULL) { + OSSL_LIB_CTX_free(libctx); legacy_teardown(*provctx); *provctx = NULL; return 0; |