dasharo/slimbootloader
0
0
Fork 0
mirror of https://github.com/Dasharo/slimbootloader.git synced 2026-06-14 04:16:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: GenContainer.py not setting default auth type correctly (#2250)

Browse Source 
When no auth parameter is specified on the command line, gen_layout
chooses auth type based on provided key, but this does not get correctly
applied to the monolithic signing component because of an order of
operations issue.

Signed-off-by: Bejean Mosher <bejean.mosher@intel.com>
This commit is contained in:
bejeanmo
2024-08-15 13:02:37 -04:00
committed by GitHub
parent f42e13e22c
commit e3dfb721bb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BootloaderCorePkg/Tools/GenContainer.py
+5 -3
View File
@@ -683,12 +683,14 @@ def adjust_auth_type (auth_type_str, key_path):
return auth_type_str
def gen_layout (comp_list, img_type, auth_type_str, svn, out_file, key_dir, key_file):
hash_type = CONTAINER._auth_to_hashalg_str[auth_type_str] if auth_type_str else ''
if auth_type_str in ['SHA2_256','SHA2_384']:
raise Exception ("Invalid 'auth' parameter '%s'. Monolithic signing requires a signature-type auth." % (auth_type_str))
auth_type = auth_type_str
key_path = os.path.join(key_dir, key_file)
auth_type = adjust_auth_type (auth_type, key_path)
if auth_type == '':
raise Exception ("'auth' parameter is expected !")
hash_type = CONTAINER._auth_to_hashalg_str[auth_type]
if auth_type_str == '':
print ("No 'auth' parameter specified. Defaulting to '%s' based on key type." % (auth_type))
# prepare the layout from individual components from '-cl'
if img_type not in CONTAINER_HDR._image_type.keys():