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 12:00:21 +0100 |
| commit | a829b735b645516041b55746e013692babd8cd31 (patch) | |
| tree | dcc8bd43fe6eb5b1893ce77b73090bd4e6b5c4b1 /providers/legacyprov.c | |
| parent | b425001010044adbdbcd98f8682694b30b73bbf4 (diff) | |
Rename some occurrences of 'library_context' and 'lib_ctx' to 'libctx'
This change makes the naming more consistent, because three different terms
were used for the same thing. (The term libctx was used by far most often.)
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/providers/legacyprov.c b/providers/legacyprov.c index 19cbf2cf25..f4e0bc9278 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) { - OSSL_LIB_CTX_free(PROV_LIBRARY_CONTEXT_OF(provctx)); + OSSL_LIB_CTX_free(PROV_LIBCTX_OF(provctx)); ossl_prov_ctx_free(provctx); } @@ -179,7 +179,7 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, const OSSL_DISPATCH **out, void **provctx) { - OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL; + OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL; OSSL_LIB_CTX *libctx = NULL; for (; in->function_id != 0; in++) { @@ -190,8 +190,8 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, case OSSL_FUNC_CORE_GET_PARAMS: c_get_params = OSSL_FUNC_core_get_params(in); break; - case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT: - c_get_libctx = OSSL_FUNC_core_get_library_context(in); + case OSSL_FUNC_CORE_GET_LIBCTX: + c_get_libctx = OSSL_FUNC_core_get_libctx(in); break; /* Just ignore anything we don't understand */ default: @@ -209,7 +209,7 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, *provctx = NULL; return 0; } - ossl_prov_ctx_set0_library_context(*provctx, libctx); + ossl_prov_ctx_set0_libctx(*provctx, libctx); ossl_prov_ctx_set0_handle(*provctx, handle); *out = legacy_dispatch_table; |