diff options
author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 11:55:50 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-10-15 12:59:53 +0200 |
commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
tree | e87a5b512d7869cb6a500ecc74b706281be762cf /include/internal/provider.h | |
parent | Make evp_pkey_ctx_get0_libctx/propq public API (diff) | |
download | openssl-b425001010044adbdbcd98f8682694b30b73bbf4.tar.xz openssl-b425001010044adbdbcd98f8682694b30b73bbf4.zip |
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 'include/internal/provider.h')
-rw-r--r-- | include/internal/provider.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/internal/provider.h b/include/internal/provider.h index 0930e56744..4afe2f4fdc 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -27,9 +27,9 @@ extern "C" { */ /* Provider Object finder, constructor and destructor */ -OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name, +OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name, int noconfig); -OSSL_PROVIDER *ossl_provider_new(OPENSSL_CTX *libctx, const char *name, +OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name, OSSL_provider_init_fn *init_function, int noconfig); int ossl_provider_up_ref(OSSL_PROVIDER *prov); @@ -42,7 +42,7 @@ int ossl_provider_add_parameter(OSSL_PROVIDER *prov, const char *name, const char *value); /* Disable fallback loading */ -int ossl_provider_disable_fallback_loading(OPENSSL_CTX *libctx); +int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx); /* * Activate the Provider @@ -57,7 +57,7 @@ int ossl_provider_available(OSSL_PROVIDER *prov); void *ossl_provider_ctx(const OSSL_PROVIDER *prov); /* Iterate over all loaded providers */ -int ossl_provider_forall_loaded(OPENSSL_CTX *, +int ossl_provider_forall_loaded(OSSL_LIB_CTX *, int (*cb)(OSSL_PROVIDER *provider, void *cbdata), void *cbdata); @@ -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); -OPENSSL_CTX *ossl_provider_library_context(const OSSL_PROVIDER *prov); +OSSL_LIB_CTX *ossl_provider_library_context(const OSSL_PROVIDER *prov); /* Thin wrappers around calls to the provider */ void ossl_provider_teardown(const OSSL_PROVIDER *prov); |