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/property | |
| 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/property')
| -rw-r--r-- | crypto/property/property.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c index cab2ab243e..c3fa8df9c6 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -279,6 +279,10 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid, int ret = 0; int j, best = -1, score, optional; +#ifndef FIPS_MODE + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + if (nid <= 0 || method == NULL || store == NULL) return 0; |