Skip to content

Commit

Permalink
Document the change in the previous commit about loading the config file
Browse files Browse the repository at this point in the history
When libssl is initialised it will attempt to load any config file. This
ensures any system_default configuration (as per
openssl#4848) is used.

Reviewed-by: Richard Levitte <[email protected]>
(Merged from openssl#5818)
  • Loading branch information
mattcaswell committed Apr 5, 2018
1 parent d8f031e commit fdb8113
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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 <openssl/rand_drbg.h> and documentation
for the RAND_DRBG API. See manual page RAND_DRBG(7) for an overview.
[Matthias St. Pierre]
Expand Down
6 changes: 4 additions & 2 deletions doc/man3/OPENSSL_init_crypto.pod
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit fdb8113

Please sign in to comment.