]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
conf/conf_sap.c: correct return of ossl_config_int() in UEFI system
authorYi Li <yi1.li@intel.com>
Tue, 27 Jun 2023 14:33:24 +0000 (22:33 +0800)
committerTomas Mraz <tomas@openssl.org>
Fri, 30 Jun 2023 14:56:02 +0000 (16:56 +0200)
FIX: https://github.com/openssl/openssl/issues/21299

ret in ossl_config_int() only used to check return value of
CONF_modules_load_file(), should set it to 1 if in UEFI system.

Signed-off-by: Yi Li <yi1.li@intel.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21300)

crypto/conf/conf_sap.c

index 2b50a9fd0d8b292460755a295c1c070cbea61da2..be87aaf7e82b84203df5adb68ed1668612a0bc45 100644 (file)
@@ -66,6 +66,8 @@ int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
 
 #ifndef OPENSSL_SYS_UEFI
     ret = CONF_modules_load_file(filename, appname, flags);
+#else
+    ret = 1;
 #endif
     openssl_configured = 1;
     return ret;