diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/man/CONF_modules_load_file.3 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/lib/libcrypto/man/CONF_modules_load_file.3 b/src/lib/libcrypto/man/CONF_modules_load_file.3 index d1bcd49a38..78cfc32f0d 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.14 2023/11/19 20:58:07 tb Exp $ | 1 | .\" $OpenBSD: CONF_modules_load_file.3,v 1.16 2025/06/09 12:43:53 schwarze 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: November 19 2023 $ | 69 | .Dd $Mdocdate: June 9 2025 $ |
70 | .Dt CONF_MODULES_LOAD_FILE 3 | 70 | .Dt CONF_MODULES_LOAD_FILE 3 |
71 | .Os | 71 | .Os |
72 | .Sh NAME | 72 | .Sh NAME |
@@ -75,6 +75,7 @@ | |||
75 | .Nm X509_get_default_cert_area | 75 | .Nm X509_get_default_cert_area |
76 | .Nd OpenSSL configuration functions | 76 | .Nd OpenSSL configuration functions |
77 | .Sh SYNOPSIS | 77 | .Sh SYNOPSIS |
78 | .Lb libcrypto | ||
78 | .In openssl/conf.h | 79 | .In openssl/conf.h |
79 | .Ft int | 80 | .Ft int |
80 | .Fo CONF_modules_load_file | 81 | .Fo CONF_modules_load_file |
@@ -222,7 +223,6 @@ Load custom configuration file and section instead of the standard one, | |||
222 | only print warnings on error, missing configuration file ignored: | 223 | only print warnings on error, missing configuration file ignored: |
223 | .Bd -literal | 224 | .Bd -literal |
224 | OPENSSL_no_config(); | 225 | OPENSSL_no_config(); |
225 | OPENSSL_load_builtin_modules(); | ||
226 | if (CONF_modules_load_file("/something/app.cnf", "myapp", | 226 | if (CONF_modules_load_file("/something/app.cnf", "myapp", |
227 | CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { | 227 | CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { |
228 | fprintf(stderr, "WARNING: error loading configuration file\en"); | 228 | fprintf(stderr, "WARNING: error loading configuration file\en"); |
@@ -233,11 +233,7 @@ if (CONF_modules_load_file("/something/app.cnf", "myapp", | |||
233 | In the previous example, the call to | 233 | In the previous example, the call to |
234 | .Xr OPENSSL_no_config 3 | 234 | .Xr OPENSSL_no_config 3 |
235 | is required first to suppress automatic loading | 235 | is required first to suppress automatic loading |
236 | of the standard configuration file, and the call to | 236 | of the standard configuration file. |
237 | .Xr OPENSSL_load_builtin_modules 3 | ||
238 | is needed so that the configuration of builtin modules | ||
239 | is loaded in addition to the configuration of | ||
240 | .Qq myapp . | ||
241 | .Pp | 237 | .Pp |
242 | Load and parse configuration file manually, custom error handling: | 238 | Load and parse configuration file manually, custom error handling: |
243 | .Bd -literal | 239 | .Bd -literal |
@@ -268,8 +264,7 @@ if (fp == NULL) { | |||
268 | .Sh SEE ALSO | 264 | .Sh SEE ALSO |
269 | .Xr CONF_modules_free 3 , | 265 | .Xr CONF_modules_free 3 , |
270 | .Xr ERR 3 , | 266 | .Xr ERR 3 , |
271 | .Xr OPENSSL_config 3 , | 267 | .Xr OPENSSL_config 3 |
272 | .Xr OPENSSL_load_builtin_modules 3 | ||
273 | .Sh HISTORY | 268 | .Sh HISTORY |
274 | .Fn X509_get_default_cert_area | 269 | .Fn X509_get_default_cert_area |
275 | first appeared in SSLeay 0.4.1 and has been available since | 270 | first appeared in SSLeay 0.4.1 and has been available since |