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 /crypto/property/property.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 'crypto/property/property.c')
-rw-r--r-- | crypto/property/property.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c index c2238ac63d..9cfca81190 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -57,7 +57,7 @@ typedef struct { } ALGORITHM; struct ossl_method_store_st { - OPENSSL_CTX *ctx; + OSSL_LIB_CTX *ctx; size_t nelem; SPARSE_ARRAY_OF(ALGORITHM) *algs; int need_flush; @@ -85,26 +85,26 @@ static void ossl_ctx_global_properties_free(void *vstore) } } -static void *ossl_ctx_global_properties_new(OPENSSL_CTX *ctx) +static void *ossl_ctx_global_properties_new(OSSL_LIB_CTX *ctx) { return OPENSSL_zalloc(sizeof(OSSL_PROPERTY_LIST **)); } -static const OPENSSL_CTX_METHOD ossl_ctx_global_properties_method = { +static const OSSL_LIB_CTX_METHOD ossl_ctx_global_properties_method = { ossl_ctx_global_properties_new, ossl_ctx_global_properties_free, }; -OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OPENSSL_CTX *libctx, +OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *libctx, int loadconfig) { #ifndef FIPS_MODULE if (loadconfig && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL)) return NULL; #endif - return openssl_ctx_get_data(libctx, OPENSSL_CTX_GLOBAL_PROPERTIES, - &ossl_ctx_global_properties_method); + return ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_GLOBAL_PROPERTIES, + &ossl_ctx_global_properties_method); } static int ossl_method_up_ref(METHOD *method) @@ -169,10 +169,10 @@ static void alg_cleanup(ossl_uintmax_t idx, ALGORITHM *a) } /* - * The OPENSSL_CTX param here allows access to underlying property data needed + * The OSSL_LIB_CTX param here allows access to underlying property data needed * for computation */ -OSSL_METHOD_STORE *ossl_method_store_new(OPENSSL_CTX *ctx) +OSSL_METHOD_STORE *ossl_method_store_new(OSSL_LIB_CTX *ctx) { OSSL_METHOD_STORE *res; |