summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2019-01-01 02:53:24 -0500
committerViktor Dukhovni <openssl-users@dukhovni.org>2019-01-07 14:02:28 -0500
commitdf1f538f28c10f2954757164b17781040d2355ef (patch)
tree983b999d0b4625fc67a05897c38c37f48aedbeba /util
parentb2f16a2271c40faed168c8bd89b562919a18cb3f (diff)
downloadopenssl-new-df1f538f28c10f2954757164b17781040d2355ef.tar.gz
More configurable crypto and ssl library initialization
1. In addition to overriding the default application name, one can now also override the configuration file name and flags passed to CONF_modules_load_file(). 2. By default we still keep going when configuration file processing fails. But, applications that want to be strict about initialization errors can now make explicit flag choices via non-null OPENSSL_INIT_SETTINGS that omit the CONF_MFLAGS_IGNORE_RETURN_CODES flag (which had so far been both undocumented and unused). 3. In OPENSSL_init_ssl() do not request OPENSSL_INIT_LOAD_CONFIG if the options already include OPENSSL_INIT_NO_LOAD_CONFIG. 4. Don't set up atexit() handlers when called with INIT_BASE_ONLY. Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7986)
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 59fc3470f1..b8b19801b2 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4620,3 +4620,5 @@ CRYPTO_siv128_set_tag 4575 3_0_0 EXIST::FUNCTION:SIV
CRYPTO_siv128_get_tag 4576 3_0_0 EXIST::FUNCTION:SIV
CRYPTO_siv128_cleanup 4577 3_0_0 EXIST::FUNCTION:SIV
CRYPTO_siv128_speed 4578 3_0_0 EXIST::FUNCTION:SIV
+OPENSSL_INIT_set_config_filename 4579 3_0_0 EXIST::FUNCTION:STDIO
+OPENSSL_INIT_set_config_file_flags 4580 3_0_0 EXIST::FUNCTION:STDIO