diff options
| author | tb <> | 2023-11-19 10:27:49 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-19 10:27:49 +0000 |
| commit | 66dd630b49c4fbeb53db3e475847c30fc8d6c814 (patch) | |
| tree | fbfa3283fcce58c7939f2f3daab2a994909edb0e /src | |
| parent | 6116479e4f6430f144d45b4e407f106b52c77d0c (diff) | |
| download | openbsd-66dd630b49c4fbeb53db3e475847c30fc8d6c814.tar.gz openbsd-66dd630b49c4fbeb53db3e475847c30fc8d6c814.tar.bz2 openbsd-66dd630b49c4fbeb53db3e475847c30fc8d6c814.zip | |
Strip out mentions of ENGINE_load_builtin_engines()
There's probably more that needs to be updated here, but that can be done
another day.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/man/CONF_modules_load_file.3 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/man/CONF_modules_load_file.3 b/src/lib/libcrypto/man/CONF_modules_load_file.3 index 964473d497..f7efba854f 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.11 2023/07/21 10:46:54 tb Exp $ | 1 | .\" $OpenBSD: CONF_modules_load_file.3,v 1.12 2023/11/19 10:27:49 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: July 21 2023 $ | 69 | .Dd $Mdocdate: November 19 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 |
| @@ -222,7 +222,6 @@ Load custom configuration file and section instead of the standard one, | |||
| 222 | only print warnings on error, missing configuration file ignored: | 222 | only print warnings on error, missing configuration file ignored: |
| 223 | .Bd -literal | 223 | .Bd -literal |
| 224 | OPENSSL_no_config(); | 224 | OPENSSL_no_config(); |
| 225 | ENGINE_load_builtin_engines(); | ||
| 226 | OPENSSL_load_builtin_modules(); | 225 | OPENSSL_load_builtin_modules(); |
| 227 | if (CONF_modules_load_file("/something/app.cnf", "myapp", | 226 | if (CONF_modules_load_file("/something/app.cnf", "myapp", |
| 228 | CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { | 227 | CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { |
| @@ -235,11 +234,9 @@ In the previous example, the call to | |||
| 235 | .Xr OPENSSL_no_config 3 | 234 | .Xr OPENSSL_no_config 3 |
| 236 | is required first to suppress automatic loading | 235 | is required first to suppress automatic loading |
| 237 | of the standard configuration file, and the calls to | 236 | of the standard configuration file, and the calls to |
| 238 | .Xr ENGINE_load_builtin_engines 3 | ||
| 239 | and | ||
| 240 | .Xr OPENSSL_load_builtin_modules 3 | 237 | .Xr OPENSSL_load_builtin_modules 3 |
| 241 | are needed so that the configuration of builtin modules and engines | 238 | is needed so that the configuration of builtin modules |
| 242 | is also loaded in addition to the configuration of | 239 | is loaded in addition to the configuration of |
| 243 | .Qq myapp . | 240 | .Qq myapp . |
| 244 | .Pp | 241 | .Pp |
| 245 | Load and parse configuration file manually, custom error handling: | 242 | Load and parse configuration file manually, custom error handling: |
