Skip to content

Commit

Permalink
conf/conf_sap.c: correct return of ossl_config_int() in UEFI system
Browse files Browse the repository at this point in the history
FIX: #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 #21300)
  • Loading branch information
liyi77 authored and t8m committed Jun 30, 2023
1 parent 063cdca commit 500e479
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions crypto/conf/conf_sap.c
Expand Up @@ -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;
Expand Down

0 comments on commit 500e479

Please sign in to comment.