QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 14:09:41 +00:00
Code Issues Projects Releases Wiki Activity

rename ossl_provider_forall_loaded to ossl_provider_doall_activated

Browse Source 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14489)
This commit is contained in:
Pauli 2021-03-10 19:37:02 +10:00
parent 3c5ce1ce81
commit 8f08957674
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/core_algorithm.c
View File

@ -107,7 +107,7 @@ void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id,
cbdata.data = data; cbdata.data = data;
if (provider == NULL) if (provider == NULL)
ossl_provider_forall_loaded(libctx, algorithm_do_this, &cbdata); ossl_provider_doall_activated(libctx, algorithm_do_this, &cbdata);
else else
algorithm_do_this(provider, &cbdata); algorithm_do_this(provider, &cbdata);
} }

2
crypto/provider.c
View File

@ -134,5 +134,5 @@ int OSSL_PROVIDER_do_all(OSSL_LIB_CTX *ctx,
void *cbdata), void *cbdata),
void *cbdata) void *cbdata)
{ {
return ossl_provider_forall_loaded(ctx, cb, cbdata); return ossl_provider_doall_activated(ctx, cb, cbdata);
} }

2
crypto/provider_core.c
View File

@ -779,7 +779,7 @@ static void provider_activate_fallbacks(struct provider_store_st *store)
CRYPTO_THREAD_unlock(store->lock); CRYPTO_THREAD_unlock(store->lock);
} }
int ossl_provider_forall_loaded(OSSL_LIB_CTX *ctx, int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
int (*cb)(OSSL_PROVIDER *provider, int (*cb)(OSSL_PROVIDER *provider,
void *cbdata), void *cbdata),
void *cbdata) void *cbdata)

8
doc/internal/man3/ossl_provider_new.pod
View File

@ -8,7 +8,7 @@ ossl_provider_set_fallback, ossl_provider_set_module_path,
ossl_provider_add_parameter, ossl_provider_add_parameter,
ossl_provider_activate, ossl_provider_deactivate, ossl_provider_available, ossl_provider_activate, ossl_provider_deactivate, ossl_provider_available,
ossl_provider_ctx, ossl_provider_ctx,
ossl_provider_forall_loaded, ossl_provider_doall_activated,
ossl_provider_name, ossl_provider_dso, ossl_provider_name, ossl_provider_dso,
ossl_provider_module_name, ossl_provider_module_path, ossl_provider_module_name, ossl_provider_module_path,
ossl_provider_libctx, ossl_provider_libctx,
@ -50,7 +50,7 @@ ossl_provider_get_capabilities
void *ossl_provider_ctx(const OSSL_PROVIDER *prov); void *ossl_provider_ctx(const OSSL_PROVIDER *prov);
/* Iterate over all loaded providers */ /* Iterate over all loaded providers */
int ossl_provider_forall_loaded(OSSL_LIB_CTX *, int ossl_provider_doall_activated(OSSL_LIB_CTX *,
int (*cb)(OSSL_PROVIDER *provider, int (*cb)(OSSL_PROVIDER *provider,
void *cbdata), void *cbdata),
void *cbdata); void *cbdata);
@ -197,7 +197,7 @@ ossl_provider_ctx() returns a context created by the provider.
Outside of the provider, it's completely opaque, but it needs to be Outside of the provider, it's completely opaque, but it needs to be
passed back to some of the provider functions. passed back to some of the provider functions.
ossl_provider_forall_loaded() iterates over all the currently ossl_provider_doall_activated() iterates over all the currently
"activated" providers, and calls I<cb> for each of them. "activated" providers, and calls I<cb> for each of them.
If no providers have been "activated" yet, it tries to activate all If no providers have been "activated" yet, it tries to activate all
available fallback providers before iterating over them. available fallback providers before iterating over them.
@ -287,7 +287,7 @@ it has been incremented.
ossl_provider_free() doesn't return any value. ossl_provider_free() doesn't return any value.
ossl_provider_forall_loaded() returns 1 if the callback was called for all ossl_provider_doall_activated() returns 1 if the callback was called for all
activated providers. A return value of 0 means that the callback was not activated providers. A return value of 0 means that the callback was not
called for any activated providers. called for any activated providers.

2
include/internal/provider.h
View File

@ -58,7 +58,7 @@ int ossl_provider_available(OSSL_PROVIDER *prov);
void *ossl_provider_ctx(const OSSL_PROVIDER *prov); void *ossl_provider_ctx(const OSSL_PROVIDER *prov);
/* Iterate over all loaded providers */ /* Iterate over all loaded providers */
int ossl_provider_forall_loaded(OSSL_LIB_CTX *, int ossl_provider_doall_activated(OSSL_LIB_CTX *,
int (*cb)(OSSL_PROVIDER *provider, int (*cb)(OSSL_PROVIDER *provider,
void *cbdata), void *cbdata),
void *cbdata); void *cbdata);