diff options
| author | Matt Caswell <matt@openssl.org> | 2020-07-31 17:29:21 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-08-17 11:27:51 +0100 |
| commit | e6c54619d151eeec32055bbd713cda11a9182246 (patch) | |
| tree | 7d1e275da8ee5d4ecbe66ae3c5593573b48dc1f2 /include | |
| parent | ebe3f24b3d53e503bd37a2a08a8b1f896014c30d (diff) | |
Load the default config file before working with default properties
A config file can change the global default properties. Therefore we
must ensure that the config file is loaded before reading or amending
them.
Fixes #12565
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12567)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/evp.h | 2 | ||||
| -rw-r--r-- | include/internal/property.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index f170e59324..d2b2584357 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -771,3 +771,5 @@ EVP_PKEY *evp_pkcs82pkey_int(const PKCS8_PRIV_KEY_INFO *p8, OPENSSL_CTX *libctx, const char *propq); #endif /* !defined(FIPS_MODULE) */ void evp_method_store_flush(OPENSSL_CTX *libctx); +int evp_set_default_properties_int(OPENSSL_CTX *libctx, const char *propq, + int loadconfig); diff --git a/include/internal/property.h b/include/internal/property.h index ca1d1e055c..cd3982549d 100644 --- a/include/internal/property.h +++ b/include/internal/property.h @@ -45,7 +45,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid, const char *prop_query, void **method); /* Get the global properties associate with the specified library context */ -OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OPENSSL_CTX *ctx); +OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OPENSSL_CTX *ctx, int loadconfig); /* property query cache functions */ int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, int nid, |