From: Yi Li <yi1.li@intel.com>
Date: Tue, 27 Jun 2023 14:33:24 +0000 (+0800)
Subject: conf/conf_sap.c: correct return of ossl_config_int() in UEFI system
X-Git-Tag: openssl-3.2.0-alpha1~562
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=500e479db1beae5fa5691d40b866329d2fdc62e7;p=thirdparty%2Fopenssl.git

conf/conf_sap.c: correct return of ossl_config_int() in UEFI system

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)
---

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 2b50a9fd0d8..be87aaf7e82 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -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;