From: tb Date: Sun, 19 Nov 2023 10:27:49 +0000 (+0000) Subject: Strip out mentions of ENGINE_load_builtin_engines() X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b46e92a9e8cef20e28ea4bcdf6f452e1a7a1f498;p=openbsd 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. --- diff --git a/lib/libcrypto/man/CONF_modules_load_file.3 b/lib/libcrypto/man/CONF_modules_load_file.3 index 964473d4973..f7efba854f5 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.11 2023/07/21 10:46:54 tb Exp $ +.\" $OpenBSD: CONF_modules_load_file.3,v 1.12 2023/11/19 10:27:49 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: July 21 2023 $ +.Dd $Mdocdate: November 19 2023 $ .Dt CONF_MODULES_LOAD_FILE 3 .Os .Sh NAME @@ -222,7 +222,6 @@ Load custom configuration file and section instead of the standard one, only print warnings on error, missing configuration file ignored: .Bd -literal OPENSSL_no_config(); -ENGINE_load_builtin_engines(); OPENSSL_load_builtin_modules(); if (CONF_modules_load_file("/something/app.cnf", "myapp", CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { @@ -235,11 +234,9 @@ In the previous example, the call to .Xr OPENSSL_no_config 3 is required first to suppress automatic loading of the standard configuration file, and the calls to -.Xr ENGINE_load_builtin_engines 3 -and .Xr OPENSSL_load_builtin_modules 3 -are needed so that the configuration of builtin modules and engines -is also loaded in addition to the configuration of +is needed so that the configuration of builtin modules +is loaded in addition to the configuration of .Qq myapp . .Pp Load and parse configuration file manually, custom error handling: