wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Provider config module: allow providers to already be loaded

Browse source 
This allows 'default' to be configured in the config file, if needed.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9371)
This commit is contained in:
Richard Levitte 2019-07-15 11:55:33 +02:00
parent fe9edc9d39
commit da02018143
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/provider_conf.c
View file

@ -113,7 +113,9 @@ static int provider_conf_load(OPENSSL_CTX *libctx, const char *name,
activate = 1;
}
prov = ossl_provider_new(libctx, name, NULL);
prov = ossl_provider_find(libctx, name);
if (prov == NULL)
prov = ossl_provider_new(libctx, name, NULL);
if (prov == NULL) {
if (soft)
ERR_clear_error();