From a829b735b645516041b55746e013692babd8cd31 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 15 Oct 2020 12:55:50 +0300 Subject: 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12621) --- crypto/store/store_meth.c | 8 ++++---- crypto/store/store_result.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crypto/store') diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c index 5a8aad22b8..166b885806 100644 --- a/crypto/store/store_meth.c +++ b/crypto/store/store_meth.c @@ -235,7 +235,7 @@ static void *construct_loader(const OSSL_ALGORITHM *algodef, * namemap entry, this is it. Should the scheme 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 *scheme = algodef->algorithm_names; int id = ossl_namemap_add_name(namemap, 0, scheme); @@ -361,7 +361,7 @@ int OSSL_STORE_LOADER_number(const OSSL_STORE_LOADER *loader) int OSSL_STORE_LOADER_is_a(const OSSL_STORE_LOADER *loader, const char *name) { if (loader->prov != NULL) { - OSSL_LIB_CTX *libctx = ossl_provider_library_context(loader->prov); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(loader->prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); return ossl_namemap_name2num(namemap, name) == loader->scheme_id; @@ -379,7 +379,7 @@ static void loader_do_one(OSSL_PROVIDER *provider, int no_store, void *vdata) { struct loader_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 *name = algodef->algorithm_names; int id = ossl_namemap_add_name(namemap, 0, name); @@ -417,7 +417,7 @@ void OSSL_STORE_LOADER_names_do_all(const OSSL_STORE_LOADER *loader, return; if (loader->prov != NULL) { - OSSL_LIB_CTX *libctx = ossl_provider_library_context(loader->prov); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(loader->prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); ossl_namemap_doall_names(namemap, loader->scheme_id, fn, data); diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index ddff1225b8..5848761a5e 100644 --- a/crypto/store/store_result.c +++ b/crypto/store/store_result.c @@ -107,7 +107,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg) OSSL_STORE_CTX *ctx = cbdata->ctx; const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_provider(ctx->fetched_loader); - OSSL_LIB_CTX *libctx = ossl_provider_library_context(provider); + OSSL_LIB_CTX *libctx = ossl_provider_libctx(provider); const char *propq = ctx->properties; const OSSL_PARAM *p; struct extracted_param_data_st helper_data; -- cgit v1.2.3