summaryrefslogtreecommitdiffstats
path: root/include/internal/provider.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-11-05 13:42:40 +0000
committerMatt Caswell <matt@openssl.org>2021-11-15 14:22:41 +0000
commitd740c9d59bcff6879bc7d6ecf8b82c9300991b50 (patch)
tree3f46ee60c16545ed9d13b09d49afe92b08fe69e2 /include/internal/provider.h
parent4f224595162b7996bfb673457ea9d37f11478793 (diff)
Don't attempt to deactive child providers if we don't need to
If a provider doesn't have any child providers then there is no need to attempt to remove them - so we should not do so. This removes some potentialy thread races. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17018)
Diffstat (limited to 'include/internal/provider.h')
-rw-r--r--include/internal/provider.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/internal/provider.h b/include/internal/provider.h
index 237c852e8d..b27d6a80b8 100644
--- a/include/internal/provider.h
+++ b/include/internal/provider.h
@@ -57,7 +57,7 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx);
* If the Provider is a module, the module will be loaded
*/
int ossl_provider_activate(OSSL_PROVIDER *prov, int upcalls, int aschild);
-int ossl_provider_deactivate(OSSL_PROVIDER *prov);
+int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren);
int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
int retain_fallbacks);