diff options
| author | Matt Caswell <matt@openssl.org> | 2021-07-27 16:59:59 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-07-28 10:35:06 +1000 |
| commit | 589fbc18aa5e72b2574a71d69c09b4f63f0ae943 (patch) | |
| tree | f25795d777c85c8c0afaa78960824fbbebd578b3 /include/crypto | |
| parent | 123ed334337e874acb1f55b36dc671de7e306824 (diff) | |
Don't try and load the config file while already loading the config file
Calls to the API function EVP_default_properties_enable_fips() will
automatically attempt to load the default config file if it is not
already loaded. Therefore this function should not be called from inside
code to process the config file.
Fixes #16165
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16168)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/evp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 68aab33cae..41ac80ed9d 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -891,6 +891,8 @@ int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx); # endif /* !defined(FIPS_MODULE) */ int evp_method_store_flush(OSSL_LIB_CTX *libctx); +int evp_default_properties_enable_fips_int(OSSL_LIB_CTX *libctx, int enable, + int loadconfig); int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq, int loadconfig, int mirrored); char *evp_get_global_properties_str(OSSL_LIB_CTX *libctx, int loadconfig); |