arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

fix(core): update build_vendorheader

Browse Source
This commit is contained in:
matejcik 2023-03-02 16:06:09 +01:00
parent 288cd11b2a
commit acbf642d39
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/tools/build_vendorheader
View File

@ -3,13 +3,15 @@ import json
import click import click
from trezorlib import firmware from trezorlib import firmware, toif
def minimum_header_len(spec): def minimum_header_len(spec):
spec = spec.copy() spec = spec.copy()
spec["header_len"] = 512000 spec["header_len"] = 512000
reparsed = firmware.VendorHeader.parse(firmware.VendorHeader.build(spec)) reparsed = firmware.VendorHeader.SUBCON.parse(
firmware.VendorHeader.SUBCON.build(spec)
)
data_length = reparsed._end_offset - reparsed._start_offset data_length = reparsed._end_offset - reparsed._start_offset
# data length + 65 for signatures, rounded up to nearest multiple of 512 # data length + 65 for signatures, rounded up to nearest multiple of 512
return (data_length + 65 + 511) // 512 * 512 return (data_length + 65 + 511) // 512 * 512
@ -22,7 +24,7 @@ def minimum_header_len(spec):
def build_vendorheader(specfile, image, outfile): def build_vendorheader(specfile, image, outfile):
spec = json.load(specfile) spec = json.load(specfile)
spec["pubkeys"] = [bytes.fromhex(k) for k in spec["pubkeys"]] spec["pubkeys"] = [bytes.fromhex(k) for k in spec["pubkeys"]]
spec["image"] = firmware.Toif.parse(image.read()) spec["image"] = toif.ToifStruct.parse(image.read())
spec["sigmask"] = 0 spec["sigmask"] = 0
spec["signature"] = b"\x00" * 64 spec["signature"] = b"\x00" * 64
@ -34,11 +36,17 @@ def build_vendorheader(specfile, image, outfile):
f"Specified header_len {spec['header_len']} too low. " f"Specified header_len {spec['header_len']} too low. "
f"Minimum allowable value is {min_length}." f"Minimum allowable value is {min_length}."
) )
elif spec["header_len"] == min_length:
click.echo(f"{specfile.name}: Header has correct length.")
else:
click.echo(
f"{specfile.name}: Extending header ({min_length} bytes) to {spec['header_len']} bytes."
)
if spec["header_len"] % 512 != 0: if spec["header_len"] % 512 != 0:
raise click.ClickException("Invalid header_len: must be a multiple of 512") raise click.ClickException("Invalid header_len: must be a multiple of 512")
outfile.write(firmware.VendorHeader.build(spec)) outfile.write(firmware.VendorHeader.SUBCON.build(spec))
if __name__ == "__main__": if __name__ == "__main__":