root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Only associate a provider with a store once it has been added to it 

This means we can distinguish providers that have been added to the
store, and those which haven't yet been.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15854)
This commit is contained in:
Matt Caswell 2021-06-21 12:13:31 +01:00
parent 814c2018e1
commit b91687c567
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/provider_core.c
View File

@ -498,7 +498,6 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
return NULL; return NULL;
prov->libctx = libctx; prov->libctx = libctx;
prov->store = store;
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
prov->error_lib = ERR_get_next_error_library(); prov->error_lib = ERR_get_next_error_library();
#endif #endif
@ -530,6 +529,7 @@ int ossl_provider_add_to_store(OSSL_PROVIDER *prov, int retain_fallbacks)
ossl_provider_free(prov); ossl_provider_free(prov);
ret = 0; ret = 0;
} }
prov->store = store;
if (!retain_fallbacks) if (!retain_fallbacks)
store->use_fallbacks = 0; store->use_fallbacks = 0;
CRYPTO_THREAD_unlock(store->lock); CRYPTO_THREAD_unlock(store->lock);
@ -1102,7 +1102,6 @@ static int provider_activate_fallbacks(struct provider_store_st *store)
if (prov == NULL) if (prov == NULL)
goto err; goto err;
prov->libctx = store->libctx; prov->libctx = store->libctx;
prov->store = store;
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
prov->error_lib = ERR_get_next_error_library(); prov->error_lib = ERR_get_next_error_library();
#endif #endif
@ -1113,8 +1112,12 @@ static int provider_activate_fallbacks(struct provider_store_st *store)
* we try to avoid calling a user callback while holding a lock. * we try to avoid calling a user callback while holding a lock.
* However, fallbacks are never third party providers so we accept this. * However, fallbacks are never third party providers so we accept this.
*/ */
if (provider_activate(prov, 0, 0) < 0 if (provider_activate(prov, 0, 0) < 0) {
|| sk_OSSL_PROVIDER_push(store->providers, prov) == 0) { ossl_provider_free(prov);
goto err;
}
prov->store = store;
if (sk_OSSL_PROVIDER_push(store->providers, prov) == 0) {
ossl_provider_free(prov); ossl_provider_free(prov);
goto err; goto err;
} }