diff options
| -rw-r--r-- | crypto/core_algorithm.c | 2 | ||||
| -rw-r--r-- | crypto/provider.c | 2 | ||||
| -rw-r--r-- | crypto/provider_core.c | 8 | ||||
| -rw-r--r-- | doc/internal/man3/ossl_provider_new.pod | 14 | ||||
| -rw-r--r-- | include/internal/provider.h | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/crypto/core_algorithm.c b/crypto/core_algorithm.c index 6222c5364d..3fcb2226c7 100644 --- a/crypto/core_algorithm.c +++ b/crypto/core_algorithm.c @@ -107,7 +107,7 @@ void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id, cbdata.data = data; if (provider == NULL) - ossl_provider_forall_loaded(libctx, algorithm_do_this, &cbdata); + ossl_provider_doall_activated(libctx, algorithm_do_this, &cbdata); else algorithm_do_this(provider, &cbdata); } diff --git a/crypto/provider.c b/crypto/provider.c index 9c94e4e377..bdff44afb9 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -134,5 +134,5 @@ int OSSL_PROVIDER_do_all(OSSL_LIB_CTX *ctx, void *cbdata), void *cbdata) { - return ossl_provider_forall_loaded(ctx, cb, cbdata); + return ossl_provider_doall_activated(ctx, cb, cbdata); } diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 1438117206..47eda52224 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -779,10 +779,10 @@ static void provider_activate_fallbacks(struct provider_store_st *store) CRYPTO_THREAD_unlock(store->lock); } -int ossl_provider_forall_loaded(OSSL_LIB_CTX *ctx, - int (*cb)(OSSL_PROVIDER *provider, - void *cbdata), - void *cbdata) +int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx, + int (*cb)(OSSL_PROVIDER *provider, + void *cbdata), + void *cbdata) { int ret = 0, i, j; struct provider_store_st *store = get_provider_store(ctx); diff --git a/doc/internal/man3/ossl_provider_new.pod b/doc/internal/man3/ossl_provider_new.pod index 43ad7556cf..8506839dee 100644 --- a/doc/internal/man3/ossl_provider_new.pod +++ b/doc/internal/man3/ossl_provider_new.pod @@ -8,7 +8,7 @@ ossl_provider_set_fallback, ossl_provider_set_module_path, ossl_provider_add_parameter, ossl_provider_activate, ossl_provider_deactivate, ossl_provider_available, ossl_provider_ctx, -ossl_provider_forall_loaded, +ossl_provider_doall_activated, ossl_provider_name, ossl_provider_dso, ossl_provider_module_name, ossl_provider_module_path, ossl_provider_libctx, @@ -50,10 +50,10 @@ ossl_provider_get_capabilities void *ossl_provider_ctx(const OSSL_PROVIDER *prov); /* Iterate over all loaded providers */ - int ossl_provider_forall_loaded(OSSL_LIB_CTX *, - int (*cb)(OSSL_PROVIDER *provider, - void *cbdata), - void *cbdata); + int ossl_provider_doall_activated(OSSL_LIB_CTX *, + int (*cb)(OSSL_PROVIDER *provider, + void *cbdata), + void *cbdata); /* Getters for other library functions */ const char *ossl_provider_name(OSSL_PROVIDER *prov); @@ -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 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. If no providers have been "activated" yet, it tries to activate all 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_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 called for any activated providers. diff --git a/include/internal/provider.h b/include/internal/provider.h index 7441bf26f0..b755f17325 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -58,10 +58,10 @@ int ossl_provider_available(OSSL_PROVIDER *prov); void *ossl_provider_ctx(const OSSL_PROVIDER *prov); /* Iterate over all loaded providers */ -int ossl_provider_forall_loaded(OSSL_LIB_CTX *, - int (*cb)(OSSL_PROVIDER *provider, - void *cbdata), - void *cbdata); +int ossl_provider_doall_activated(OSSL_LIB_CTX *, + int (*cb)(OSSL_PROVIDER *provider, + void *cbdata), + void *cbdata); /* Getters for other library functions */ const char *ossl_provider_name(const OSSL_PROVIDER *prov); |