summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-07-21 10:46:54 +0000
committertb <>2023-07-21 10:46:54 +0000
commite8b98fc0ff7a1b5d9a6f93219405a59a366677f0 (patch)
treefe1233ca47073b40aafeebf757258bc5dec5dc65
parent6254f13919cae41aa3862653614786ecf0070bfe (diff)
downloadopenbsd-e8b98fc0ff7a1b5d9a6f93219405a59a366677f0.tar.gz
openbsd-e8b98fc0ff7a1b5d9a6f93219405a59a366677f0.tar.bz2
openbsd-e8b98fc0ff7a1b5d9a6f93219405a59a366677f0.zip
Simple adjustments for DSO removal
openssl.cnf.5 will need a major overhaul. But that isn't new...
-rw-r--r--src/lib/libcrypto/man/CONF_modules_free.39
-rw-r--r--src/lib/libcrypto/man/CONF_modules_load_file.35
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libcrypto/man/CONF_modules_free.3 b/src/lib/libcrypto/man/CONF_modules_free.3
index be5f64d1e1..c5fb840942 100644
--- a/src/lib/libcrypto/man/CONF_modules_free.3
+++ b/src/lib/libcrypto/man/CONF_modules_free.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: CONF_modules_free.3,v 1.5 2018/03/22 21:08:22 schwarze Exp $ 1.\" $OpenBSD: CONF_modules_free.3,v 1.6 2023/07/21 10:46:54 tb Exp $
2.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400 2.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>. 4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: March 22 2018 $ 51.Dd $Mdocdate: July 21 2023 $
52.Dt CONF_MODULES_FREE 3 52.Dt CONF_MODULES_FREE 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -87,10 +87,7 @@ that module may have performed.
87finishes and unloads configuration modules. 87finishes and unloads configuration modules.
88If 88If
89.Fa all 89.Fa all
90is set to 0, only modules loaded from DSOs will be unloaded. 90is set to 1, the builtin modules will be unloaded as well.
91If
92.Fa all
93is 1, all modules, including builtin modules, will be unloaded.
94.Sh SEE ALSO 91.Sh SEE ALSO
95.Xr CONF_modules_load_file 3 , 92.Xr CONF_modules_load_file 3 ,
96.Xr OPENSSL_config 3 93.Xr OPENSSL_config 3
diff --git a/src/lib/libcrypto/man/CONF_modules_load_file.3 b/src/lib/libcrypto/man/CONF_modules_load_file.3
index bd419ef3e3..964473d497 100644
--- a/src/lib/libcrypto/man/CONF_modules_load_file.3
+++ b/src/lib/libcrypto/man/CONF_modules_load_file.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: CONF_modules_load_file.3,v 1.10 2021/08/03 18:49:30 schwarze Exp $ 1.\" $OpenBSD: CONF_modules_load_file.3,v 1.11 2023/07/21 10:46:54 tb Exp $
2.\" full merge up to: e9b77246 Jan 20 19:58:49 2017 +0100 2.\" full merge up to: e9b77246 Jan 20 19:58:49 2017 +0100
3.\" selective merge up to: d090fc00 Feb 26 13:11:10 2019 +0800 3.\" selective merge up to: d090fc00 Feb 26 13:11:10 2019 +0800
4.\" 4.\"
@@ -66,7 +66,7 @@
66.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 66.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
67.\" OF THE POSSIBILITY OF SUCH DAMAGE. 67.\" OF THE POSSIBILITY OF SUCH DAMAGE.
68.\" 68.\"
69.Dd $Mdocdate: August 3 2021 $ 69.Dd $Mdocdate: July 21 2023 $
70.Dt CONF_MODULES_LOAD_FILE 3 70.Dt CONF_MODULES_LOAD_FILE 3
71.Os 71.Os
72.Sh NAME 72.Sh NAME
@@ -143,6 +143,7 @@ Do not add any error information.
143By default, all module errors add error information to the error queue. 143By default, all module errors add error information to the error queue.
144.It Dv CONF_MFLAGS_NO_DSO 144.It Dv CONF_MFLAGS_NO_DSO
145Disable loading of configuration modules from DSOs. 145Disable loading of configuration modules from DSOs.
146This flag is provided for compatibility and has no effect.
146.It Dv CONF_MFLAGS_IGNORE_MISSING_FILE 147.It Dv CONF_MFLAGS_IGNORE_MISSING_FILE
147Let 148Let
148.Fn CONF_modules_load_file 149.Fn CONF_modules_load_file