OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix GenContainer python scripts 

After GenContainer script was created, there ware more changes
introduced for signing and compression. However, GenContainer
was not updated to match those new changes. This patch addressed
this issue.

Signed-off-by: Maurice Ma <maurice.ma@intel.com>
This commit is contained in:
Maurice Ma 2021-01-12 13:50:14 -08:00 committed by Guo Dong
parent 7bbc273c1b
commit 86a24b8171
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BootloaderCorePkg/Tools/CommonUtility.py
View File

@ -331,7 +331,7 @@ def decompress (in_file, out_file, tool_dir = ''):
lz_hdr = LZ_HEADER.from_buffer (di)
offset = sizeof (lz_hdr)
if lz_hdr.signature == b"LZDM":
if lz_hdr.signature == b"LZDM" or lz_hdr.compressed_len == 0:
fo = open(out_file,'wb')
fo.write(di[offset:offset + lz_hdr.compressed_len])
fo.close()
@ -344,6 +344,7 @@ def decompress (in_file, out_file, tool_dir = ''):
alg = "Lz4"
else:
raise Exception ("Unsupported compression '%s' !" % lz_hdr.signature)
fo = open(temp, 'wb')
fo.write(di[offset:offset + lz_hdr.compressed_len])
fo.close()

20
BootloaderCorePkg/Tools/GenContainer.py
View File

@ -8,7 +8,7 @@
##
import sys
import argparse
import re
sys.dont_write_bytecode = True
from ctypes import *
from CommonUtility import *
@ -586,16 +586,24 @@ class CONTAINER ():
# create header entry
auth_type_str = self.get_auth_type_str (self.header.auth_type)
key_file = 'KEY_ID_CONTAINER_RSA2048' if auth_type_str.startswith('RSA') else ''
match = re.match('RSA(\d+)_', auth_type_str)
if match:
key_file = 'KEY_ID_CONTAINER_RSA%s' % match.group(1)
else:
key_file = ''
alignment = self.header.alignment
image_type_str = CONTAINER.get_image_type_str(self.header.image_type)
header = ['%s' % self.header.signature.decode(), file_name, image_type_str, auth_type_str, key_file]
layout = [(' Name', ' ImageFile', ' CompAlg', ' AuthType', ' KeyFile', ' Alignment', ' Size', 'svn')]
layout = [(' Name', ' ImageFile', ' CompAlg', ' AuthType', ' KeyFile', ' Alignment', ' Size', 'Svn')]
layout.append(tuple(["'%s'" % x for x in header] + ['0x%x' % alignment, '0', '0x%x' % self.header.svn]))
# create component entry
for component in self.header.comp_entry:
auth_type_str = self.get_auth_type_str (component.auth_type)
key_file = 'KEY_ID_CONTAINER_COMP_RSA2048' if auth_type_str.startswith('RSA') else ''
match = re.match('RSA(\d+)_', auth_type_str)
if match:
key_file = 'KEY_ID_CONTAINER_COMP_RSA%s' % match.group(1)
else:
key_file = ''
lz_header = LZ_HEADER.from_buffer(component.data)
alg = LZ_HEADER._compress_alg[lz_header.signature]
svn = lz_header.svn
@ -611,14 +619,14 @@ class CONTAINER ():
fo = open (layout_file, 'w')
fo.write ('# Container Layout File\n#\n')
for idx, each in enumerate(layout):
line = ' %-6s, %-16s, %-10s, %-18s, %-30s, %-10s, %-10s, %-10s' % each
line = ' %-6s, %-16s, %-10s, %-24s, %-32s, %-10s, %-10s, %-10s' % each
if idx == 0:
line = '# %s\n' % line
else:
line = ' (%s),\n' % line
fo.write (line)
if idx == 0:
line = '# %s\n' % ('=' * 120)
line = '# %s\n' % ('=' * 136)
fo.write (line)
fo.close()