diff options
| author | Matt Caswell <matt@openssl.org> | 2019-07-30 17:42:53 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-08-01 10:59:20 +0200 |
| commit | 29dc6e00f2a1ec93bbacc5127cecf3412e95e57f (patch) | |
| tree | e14982624eb7d057b64d73fdc7a617f49a0ff178 /crypto/provider.c | |
| parent | Suppress loading the FIPS module in evp_test (diff) | |
| download | openssl-29dc6e00f2a1ec93bbacc5127cecf3412e95e57f.tar.xz openssl-29dc6e00f2a1ec93bbacc5127cecf3412e95e57f.zip | |
Load the config file by default
Previously we only loaded the config file by default for libssl. Now we do
it for libcrypto too.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9492)
Diffstat (limited to 'crypto/provider.c')
| -rw-r--r-- | crypto/provider.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/provider.c b/crypto/provider.c index 0250955a70..25ded2df99 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -17,8 +17,8 @@ OSSL_PROVIDER *OSSL_PROVIDER_load(OPENSSL_CTX *libctx, const char *name) OSSL_PROVIDER *prov = NULL; /* Find it or create it */ - if ((prov = ossl_provider_find(libctx, name)) == NULL - && (prov = ossl_provider_new(libctx, name, NULL)) == NULL) + if ((prov = ossl_provider_find(libctx, name, 0)) == NULL + && (prov = ossl_provider_new(libctx, name, NULL, 0)) == NULL) return NULL; if (!ossl_provider_activate(prov)) { @@ -41,7 +41,7 @@ int OSSL_PROVIDER_available(OPENSSL_CTX *libctx, const char *name) int available = 0; /* Find it or create it */ - prov = ossl_provider_find(libctx, name); + prov = ossl_provider_find(libctx, name, 0); available = ossl_provider_available(prov); ossl_provider_free(prov); return available; @@ -69,7 +69,7 @@ int OSSL_PROVIDER_add_builtin(OPENSSL_CTX *libctx, const char *name, } /* Create it */ - if ((prov = ossl_provider_new(libctx, name, init_fn)) == NULL) + if ((prov = ossl_provider_new(libctx, name, init_fn, 0)) == NULL) return 0; /* |