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/core_namemap.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/core_namemap.c')
| -rw-r--r-- | crypto/core_namemap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index b08fb84556..0cde909fc4 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -62,9 +62,9 @@ static void namenum_free(NAMENUM_ENTRY *n) OPENSSL_free(n); } -/* OPENSSL_CTX_METHOD functions for a namemap stored in a library context */ +/* OSSL_LIB_CTX_METHOD functions for a namemap stored in a library context */ -static void *stored_namemap_new(OPENSSL_CTX *libctx) +static void *stored_namemap_new(OSSL_LIB_CTX *libctx) { OSSL_NAMEMAP *namemap = ossl_namemap_new(); @@ -85,7 +85,7 @@ static void stored_namemap_free(void *vnamemap) } } -static const OPENSSL_CTX_METHOD stored_namemap_method = { +static const OSSL_LIB_CTX_METHOD stored_namemap_method = { stored_namemap_new, stored_namemap_free, }; @@ -390,11 +390,11 @@ static void get_legacy_md_names(const OBJ_NAME *on, void *arg) * ========================== */ -OSSL_NAMEMAP *ossl_namemap_stored(OPENSSL_CTX *libctx) +OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx) { OSSL_NAMEMAP *namemap = - openssl_ctx_get_data(libctx, OPENSSL_CTX_NAMEMAP_INDEX, - &stored_namemap_method); + ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_NAMEMAP_INDEX, + &stored_namemap_method); #ifndef FIPS_MODULE if (namemap != NULL && ossl_namemap_empty(namemap)) { |