From b425001010044adbdbcd98f8682694b30b73bbf4 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 15 Oct 2020 12:55:50 +0300 Subject: 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12621) --- providers/common/include/prov/provider_ctx.h | 6 +++--- providers/common/include/prov/provider_util.h | 8 ++++---- providers/common/include/prov/providercommon.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'providers/common/include') diff --git a/providers/common/include/prov/provider_ctx.h b/providers/common/include/prov/provider_ctx.h index c650777280..6abc8d2111 100644 --- a/providers/common/include/prov/provider_ctx.h +++ b/providers/common/include/prov/provider_ctx.h @@ -17,7 +17,7 @@ typedef struct prov_ctx_st { const OSSL_CORE_HANDLE *handle; - OPENSSL_CTX *libctx; /* For all provider modules */ + OSSL_LIB_CTX *libctx; /* For all provider modules */ BIO_METHOD *corebiometh; } PROV_CTX; @@ -30,10 +30,10 @@ typedef struct prov_ctx_st { PROV_CTX *ossl_prov_ctx_new(void); void ossl_prov_ctx_free(PROV_CTX *ctx); -void ossl_prov_ctx_set0_library_context(PROV_CTX *ctx, OPENSSL_CTX *libctx); +void ossl_prov_ctx_set0_library_context(PROV_CTX *ctx, OSSL_LIB_CTX *libctx); void ossl_prov_ctx_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle); void ossl_prov_ctx_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh); -OPENSSL_CTX *ossl_prov_ctx_get0_library_context(PROV_CTX *ctx); +OSSL_LIB_CTX *ossl_prov_ctx_get0_library_context(PROV_CTX *ctx); const OSSL_CORE_HANDLE *ossl_prov_ctx_get0_handle(PROV_CTX *ctx); BIO_METHOD *ossl_prov_ctx_get0_core_bio_method(PROV_CTX *ctx); diff --git a/providers/common/include/prov/provider_util.h b/providers/common/include/prov/provider_util.h index 83f6d63ed7..1f6f4687ad 100644 --- a/providers/common/include/prov/provider_util.h +++ b/providers/common/include/prov/provider_util.h @@ -45,7 +45,7 @@ typedef struct { */ int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc, const OSSL_PARAM params[], - OPENSSL_CTX *ctx); + OSSL_LIB_CTX *ctx); /* Reset the PROV_CIPHER fields and free any allocated cipher reference */ void ossl_prov_cipher_reset(PROV_CIPHER *pc); @@ -63,7 +63,7 @@ ENGINE *ossl_prov_cipher_engine(const PROV_CIPHER *pc); * Fetch a digest from the specified libctx using the provided mdname and * propquery. Store the result in the PROV_DIGEST and return the fetched md. */ -const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OPENSSL_CTX *libctx, +const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OSSL_LIB_CTX *libctx, const char *mdname, const char *propquery); /* @@ -74,7 +74,7 @@ const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OPENSSL_CTX *libctx, */ int ossl_prov_digest_load_from_params(PROV_DIGEST *pd, const OSSL_PARAM params[], - OPENSSL_CTX *ctx); + OSSL_LIB_CTX *ctx); /* Reset the PROV_DIGEST fields and free any allocated digest reference */ void ossl_prov_digest_reset(PROV_DIGEST *pd); @@ -123,7 +123,7 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx, const char *macname, const char *ciphername, const char *mdname, - OPENSSL_CTX *ctx); + OSSL_LIB_CTX *ctx); typedef struct ag_capable_st { OSSL_ALGORITHM alg; diff --git a/providers/common/include/prov/providercommon.h b/providers/common/include/prov/providercommon.h index d90492c723..622fe1977e 100644 --- a/providers/common/include/prov/providercommon.h +++ b/providers/common/include/prov/providercommon.h @@ -10,7 +10,7 @@ #include #include -const OSSL_CORE_HANDLE *FIPS_get_core_handle(OPENSSL_CTX *ctx); +const OSSL_CORE_HANDLE *FIPS_get_core_handle(OSSL_LIB_CTX *ctx); const char *ossl_prov_util_nid_to_name(int nid); -- cgit v1.2.1