From fdb8113daedbcc01e3effc5b0a1ed97558d700a5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 3 Apr 2018 10:03:34 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/5818) --- CHANGES | 3 +++ doc/man3/OPENSSL_init_crypto.pod | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 40b5823..e5f6cb6 100644 --- a/CHANGES +++ b/CHANGES @@ -13,6 +13,9 @@ in libcrypto when run as setuid/setgid. [Bernd Edlinger] + *) Load any config file by default when libssl is used. + [Matt Caswell] + *) Added new public header file and documentation for the RAND_DRBG API. See manual page RAND_DRBG(7) for an overview. [Matthias St. Pierre] diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod index ce7497e..c6a1715 100644 --- a/doc/man3/OPENSSL_init_crypto.pod +++ b/doc/man3/OPENSSL_init_crypto.pod @@ -95,8 +95,10 @@ B 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 for further details about libssl initialisation). See the +description of OPENSSL_INIT_new(), below. =item OPENSSL_INIT_NO_LOAD_CONFIG -- cgit v1.1