diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 76d526eaf0ba1d92049f82c3968f092dcafe9bb0..a821d17e46afedc8505dcb7147a4f342a2dee306 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -566,14 +566,6 @@ static int provider_forall_loaded(struct provider_store_st *store, int ret = 1; int num_provs; -#ifndef FIPS_MODE - /* - * Make sure any providers are loaded from config before we try to use - * them. - */ - OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); -#endif - num_provs = sk_OSSL_PROVIDER_num(store->providers); if (found_activated != NULL) @@ -638,6 +630,14 @@ int ossl_provider_forall_loaded(OPENSSL_CTX *ctx, int ret = 1; struct provider_store_st *store = get_provider_store(ctx); +#ifndef FIPS_MODE + /* + * Make sure any providers are loaded from config before we try to use + * them. + */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + if (store != NULL) { CRYPTO_THREAD_read_lock(store->lock);