From f33d843633a582f202f684491254bada42a8ec30 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Wed, 21 Mar 2018 22:08:04 +0000
Subject: Catch up after beck@ fixed autoconfiguration: * Say more precisely
 what OPENSSL_config(3) and OPENSSL_no_config(3) do. * Revert the deprecation
 notice for them, nothing wrong with them. * Document
 OPENSSL_INIT_LOAD_CONFIG. * Deprecate OpenSSL_add_all_algorithms(3), it's now
 automatic. * Add OpenSSL_add_all_algorithms(3) HISTORY. Substantial feedback
 and OK beck@.

---
 src/lib/libcrypto/man/OPENSSL_init_crypto.3 | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/lib/libcrypto/man/OPENSSL_init_crypto.3')

diff --git a/src/lib/libcrypto/man/OPENSSL_init_crypto.3 b/src/lib/libcrypto/man/OPENSSL_init_crypto.3
index 27c60561fe..525d748cea 100644
--- a/src/lib/libcrypto/man/OPENSSL_init_crypto.3
+++ b/src/lib/libcrypto/man/OPENSSL_init_crypto.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OPENSSL_init_crypto.3,v 1.1 2018/03/17 18:52:42 schwarze Exp $
+.\" $OpenBSD: OPENSSL_init_crypto.3,v 1.2 2018/03/21 22:08:04 schwarze Exp $
 .\" Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 17 2018 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt OPENSSL_INIT_CRYPTO 3
 .Os
 .Sh NAME
@@ -31,14 +31,21 @@ If
 .Fn OPENSSL_init_crypto
 is called before any other crypto or ssl functions, the crypto
 library is initialised by allocating various internal resources.
-Unless the
-.Dv OPENSSL_INIT_NO_LOAD_CONFIG
-bit is set in the
+.Pp
+The following
 .Fa options
-argument, the default
-.Xr openssl.cnf 5
-configuration file is also loaded as documented in
+are supported:
+.Bl -tag -width Ds
+.It Dv OPENSSL_INIT_LOAD_CONFIG
+At the end of the initialization, call
+.Xr OPENSSL_config 3
+with a
+.Dv NULL
+argument, loading the default configuration file.
+.It Dv OPENSSL_INIT_NO_LOAD_CONFIG
+Ignore any later calls to
 .Xr OPENSSL_config 3 .
+.El
 .Pp
 The other
 .Fa options
@@ -61,7 +68,9 @@ the first one have any effect.
 is intended to return 1 on success or 0 on error.
 .Sh SEE ALSO
 .Xr CONF_modules_load_file 3 ,
+.Xr OPENSSL_config 3 ,
 .Xr OPENSSL_init_ssl 3 ,
+.Xr OPENSSL_load_builtin_modules 3 ,
 .Xr openssl.cnf 5
 .Sh HISTORY
 .Fn OPENSSL_init_crypto
-- 
cgit v1.2.3-55-g6feb