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 /crypto/encode_decode/encoder_meth.c | |
| 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 'crypto/encode_decode/encoder_meth.c')
| -rw-r--r-- | crypto/encode_decode/encoder_meth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/encode_decode/encoder_meth.c b/crypto/encode_decode/encoder_meth.c index bc3c1bd32a..bee54bf63a 100644 --- a/crypto/encode_decode/encoder_meth.c +++ b/crypto/encode_decode/encoder_meth.c @@ -257,7 +257,7 @@ static void *construct_encoder(const OSSL_ALGORITHM *algodef, * namemap entry, this is it. Should the name already exist there, we * know that ossl_namemap_add() will return its corresponding number. */ - OSSL_LIB_CTX *libctx = ossl_provider_library_context(prov); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); const char *names = algodef->algorithm_names; int id = ossl_namemap_add_names(namemap, 0, names, NAME_SEPARATOR); @@ -392,7 +392,7 @@ int OSSL_ENCODER_number(const OSSL_ENCODER *encoder) int OSSL_ENCODER_is_a(const OSSL_ENCODER *encoder, const char *name) { if (encoder->base.prov != NULL) { - OSSL_LIB_CTX *libctx = ossl_provider_library_context(encoder->base.prov); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(encoder->base.prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); return ossl_namemap_name2num(namemap, name) == encoder->base.id; @@ -410,7 +410,7 @@ static void encoder_do_one(OSSL_PROVIDER *provider, int no_store, void *vdata) { struct encoder_do_all_data_st *data = vdata; - OSSL_LIB_CTX *libctx = ossl_provider_library_context(provider); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(provider); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); const char *names = algodef->algorithm_names; int id = ossl_namemap_add_names(namemap, 0, names, NAME_SEPARATOR); @@ -451,7 +451,7 @@ void OSSL_ENCODER_names_do_all(const OSSL_ENCODER *encoder, return; if (encoder->base.prov != NULL) { - OSSL_LIB_CTX *libctx = ossl_provider_library_context(encoder->base.prov); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(encoder->base.prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); ossl_namemap_doall_names(namemap, encoder->base.id, fn, data); |