diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-03-20 20:25:39 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-03-20 20:25:39 +1000 |
| commit | 22e27978b29b2cdc1db79659ed653d6cf31834ab (patch) | |
| tree | f156d63b1f889794d723167e59108d088fbe5907 /util | |
| parent | 0f2deef59d13e852a4bde0e853e9b49bab51a108 (diff) | |
Add support for passing the libctx to the config loader
The self tests for the fips module are triggered on startup and they need to know the
core's libctx in order to function correctly. As the provider can be autoloaded via configuration
it then needs to propagate the callers libctx down to the provider via the config load.
Note that OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, ..) is still called, but will only load the default
configuration if the OPENSSL_CONF environment variable is set.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11240)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 3 | ||||
| -rw-r--r-- | util/missingcrypto.txt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index cd1aa75a84..0e275084d1 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4984,3 +4984,6 @@ EVP_PKEY_gen ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_set_rsa_keygen_bits ? 3_0_0 EXIST::FUNCTION:RSA EVP_PKEY_CTX_set_rsa_keygen_pubexp ? 3_0_0 EXIST::FUNCTION:RSA EVP_PKEY_CTX_set_rsa_keygen_primes ? 3_0_0 EXIST::FUNCTION:RSA +NCONF_new_with_libctx ? 3_0_0 EXIST::FUNCTION: +CONF_modules_load_file_with_libctx ? 3_0_0 EXIST::FUNCTION: +OPENSSL_CTX_load_config ? 3_0_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 956ce7ce6e..4c3af107d9 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -749,18 +749,14 @@ NAME_CONSTRAINTS_check_CN(3) NAME_CONSTRAINTS_it(3) NAMING_AUTHORITY_it(3) NCONF_WIN32(3) -NCONF_default(3) NCONF_dump_bio(3) NCONF_dump_fp(3) -NCONF_free(3) NCONF_free_data(3) NCONF_get_number_e(3) NCONF_get_section(3) NCONF_get_string(3) -NCONF_load(3) NCONF_load_bio(3) NCONF_load_fp(3) -NCONF_new(3) NETSCAPE_CERT_SEQUENCE_it(3) NETSCAPE_SPKAC_it(3) NETSCAPE_SPKI_b64_decode(3) |