summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-04-03 10:03:34 +0100
committerMatt Caswell <matt@openssl.org>2018-04-05 15:30:12 +0100
commitfdb8113daedbcc01e3effc5b0a1ed97558d700a5 (patch)
tree5779fbf6ef2747123bbe64c816ae3a54bcf757e4 /doc
parentd8f031e890d35887047c35b60347ac385b989065 (diff)
Document the change in the previous commit about loading the config file
When libssl is initialised it will attempt to load any config file. This ensures any system_default configuration (as per https://github.com/openssl/openssl/pull/4848) is used. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5818)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/OPENSSL_init_crypto.pod6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index ce7497e1b0..c6a17154a4 100644
--- a/doc/man3/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
@@ -95,8 +95,10 @@ 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.
-See the description of OPENSSL_INIT_new(), below.
+used by calling OPENSSL_config(). This is not a default option for libcrypto.
+From 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.
=item OPENSSL_INIT_NO_LOAD_CONFIG