diff options
author | Matt Caswell <matt@openssl.org> | 2019-07-30 16:42:53 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-08-01 09:59:20 +0100 |
commit | 29dc6e00f2a1ec93bbacc5127cecf3412e95e57f (patch) | |
tree | e14982624eb7d057b64d73fdc7a617f49a0ff178 /doc/man3 | |
parent | 988b29850b9e7b2b21d680545aeed76273a42a16 (diff) |
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 'doc/man3')
-rw-r--r-- | doc/man3/OPENSSL_init_crypto.pod | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod index e20fc8c998..d1a3fd5d1d 100644 --- a/doc/man3/OPENSSL_init_crypto.pod +++ b/doc/man3/OPENSSL_init_crypto.pod @@ -101,10 +101,12 @@ B<OPENSSL_INIT_ADD_ALL_DIGESTS> will be ignored. =item OPENSSL_INIT_LOAD_CONFIG With this option an OpenSSL configuration file will be automatically loaded and -used by calling OPENSSL_config(). This is not a default option for libcrypto. -As of OpenSSL 1.1.1 this is a default option for libssl (see -L<OPENSSL_init_ssl(3)> for further details about libssl initialisation). See the -description of OPENSSL_INIT_new(), below. +used by calling OPENSSL_config(). This is a default option. +Note that in OpenSSL 1.1.1 this was the default for libssl but not for +libcrypto (see L<OPENSSL_init_ssl(3)> for further details about libssl +initialisation). +In OpenSSL 1.1.0 this was a non-default option for both libssl and libcrypto. +See the description of OPENSSL_INIT_new(), below. =item OPENSSL_INIT_NO_LOAD_CONFIG @@ -229,7 +231,7 @@ B<CONF_MFLAGS_IGNORE_MISSING_FILE>, B<CONF_MFLAGS_IGNORE_RETURN_CODES> and B<CONF_MFLAGS_DEFAULT_SECTION> flags. The filename, application name, and flags can be customized by providing a non-null B<OPENSSL_INIT_SETTINGS> object. -The object can be allocated via B<OPENSSL_init_new()>. +The object can be allocated via B<OPENSSL_INIT_new()>. The B<OPENSSL_INIT_set_config_filename()> function can be used to specify a non-default filename, which is copied and need not refer to persistent storage. Similarly, OPENSSL_INIT_set_config_appname() can be used to specify a |