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 /include | |
| 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 'include')
| -rw-r--r-- | include/crypto/bn.h | 2 | ||||
| -rw-r--r-- | include/internal/provider.h | 2 | ||||
| -rw-r--r-- | include/openssl/core_dispatch.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/crypto/bn.h b/include/crypto/bn.h index 6652760aa2..c1d5b2b3ec 100644 --- a/include/crypto/bn.h +++ b/include/crypto/bn.h @@ -110,7 +110,7 @@ int bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin, const BIGNUM *r1, const BIGNUM *r2, int nlen, const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb); -OSSL_LIB_CTX *bn_get_lib_ctx(BN_CTX *ctx); +OSSL_LIB_CTX *bn_get_libctx(BN_CTX *ctx); extern const BIGNUM bn_inv_sqrt_2; diff --git a/include/internal/provider.h b/include/internal/provider.h index 4afe2f4fdc..ab36c93b32 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -68,7 +68,7 @@ const DSO *ossl_provider_dso(const OSSL_PROVIDER *prov); const char *ossl_provider_module_name(const OSSL_PROVIDER *prov); const char *ossl_provider_module_path(const OSSL_PROVIDER *prov); void *ossl_provider_prov_ctx(const OSSL_PROVIDER *prov); -OSSL_LIB_CTX *ossl_provider_library_context(const OSSL_PROVIDER *prov); +OSSL_LIB_CTX *ossl_provider_libctx(const OSSL_PROVIDER *prov); /* Thin wrappers around calls to the provider */ void ossl_provider_teardown(const OSSL_PROVIDER *prov); diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index 63105d6629..249d5e2506 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -66,8 +66,8 @@ OSSL_CORE_MAKE_FUNC(int,core_get_params,(const OSSL_CORE_HANDLE *prov, # define OSSL_FUNC_CORE_THREAD_START 3 OSSL_CORE_MAKE_FUNC(int,core_thread_start,(const OSSL_CORE_HANDLE *prov, OSSL_thread_stop_handler_fn handfn)) -# define OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT 4 -OSSL_CORE_MAKE_FUNC(OPENSSL_CORE_CTX *,core_get_library_context, +# define OSSL_FUNC_CORE_GET_LIBCTX 4 +OSSL_CORE_MAKE_FUNC(OPENSSL_CORE_CTX *,core_get_libctx, (const OSSL_CORE_HANDLE *prov)) # define OSSL_FUNC_CORE_NEW_ERROR 5 OSSL_CORE_MAKE_FUNC(void,core_new_error,(const OSSL_CORE_HANDLE *prov)) |