diff options
| author | Yi Li <yi1.li@intel.com> | 2023-06-27 22:33:24 +0800 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-06-30 16:56:02 +0200 |
| commit | 500e479db1beae5fa5691d40b866329d2fdc62e7 (patch) | |
| tree | 1f5ddbe7d07efd524ca31a0467bcca6ad48cf326 /crypto/conf | |
| parent | 063cdca61adfd4d418affe850f8bebbf528d05d9 (diff) | |
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)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_sap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 2b50a9fd0d..be87aaf7e8 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; |