From: tb <tb@openbsd.org>
Date: Fri, 21 Jul 2023 10:46:54 +0000 (+0000)
Subject: Simple adjustments for DSO removal
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=91d9be7d5c2537d28f0102b77fe650f5687c2713;p=openbsd

Simple adjustments for DSO removal

openssl.cnf.5 will need a major overhaul. But that isn't new...
---

diff --git a/lib/libcrypto/man/CONF_modules_free.3 b/lib/libcrypto/man/CONF_modules_free.3
index be5f64d1e10..c5fb840942b 100644
--- a/lib/libcrypto/man/CONF_modules_free.3
+++ b/lib/libcrypto/man/CONF_modules_free.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: CONF_modules_free.3,v 1.5 2018/03/22 21:08:22 schwarze Exp $
+.\"	$OpenBSD: CONF_modules_free.3,v 1.6 2023/07/21 10:46:54 tb Exp $
 .\"	OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: July 21 2023 $
 .Dt CONF_MODULES_FREE 3
 .Os
 .Sh NAME
@@ -87,10 +87,7 @@ that module may have performed.
 finishes and unloads configuration modules.
 If
 .Fa all
-is set to 0, only modules loaded from DSOs will be unloaded.
-If
-.Fa all
-is 1, all modules, including builtin modules, will be unloaded.
+is set to 1, the builtin modules will be unloaded as well.
 .Sh SEE ALSO
 .Xr CONF_modules_load_file 3 ,
 .Xr OPENSSL_config 3
diff --git a/lib/libcrypto/man/CONF_modules_load_file.3 b/lib/libcrypto/man/CONF_modules_load_file.3
index bd419ef3e31..964473d4973 100644
--- a/lib/libcrypto/man/CONF_modules_load_file.3
+++ b/lib/libcrypto/man/CONF_modules_load_file.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CONF_modules_load_file.3,v 1.10 2021/08/03 18:49:30 schwarze Exp $
+.\" $OpenBSD: CONF_modules_load_file.3,v 1.11 2023/07/21 10:46:54 tb Exp $
 .\" full merge up to: e9b77246 Jan 20 19:58:49 2017 +0100
 .\" selective merge up to: d090fc00 Feb 26 13:11:10 2019 +0800
 .\"
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 3 2021 $
+.Dd $Mdocdate: July 21 2023 $
 .Dt CONF_MODULES_LOAD_FILE 3
 .Os
 .Sh NAME
@@ -143,6 +143,7 @@ Do not add any error information.
 By default, all module errors add error information to the error queue.
 .It Dv CONF_MFLAGS_NO_DSO
 Disable loading of configuration modules from DSOs.
+This flag is provided for compatibility and has no effect.
 .It Dv CONF_MFLAGS_IGNORE_MISSING_FILE
 Let
 .Fn CONF_modules_load_file