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

tools: fix firmwarectl to reflect loader rename

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-20 16:03:02 +01:00
parent cbaca604f3
commit 630ce53c73
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/bootloader.bin
View File

Binary file not shown.

12
tools/firmwarectl
View File

@ -6,7 +6,7 @@ import hashlib
import ed25519 import ed25519
# bootloader/firmware headers specification: https://github.com/trezor/trezor-core/blob/master/docs/bootloader.md # loader/firmware headers specification: https://github.com/trezor/trezor-core/blob/master/docs/bootloader.md
# converts 8-bit bitmap to tuple of values # converts 8-bit bitmap to tuple of values
@ -33,14 +33,14 @@ def get_sig(data):
return sigidx, sig return sigidx, sig
class BootloaderImage: class LoaderImage:
def __init__(self, data): def __init__(self, data):
header = struct.unpack('<4sIIIBBBB171sB64s', data[:256]) header = struct.unpack('<4sIIIBBBB171sB64s', data[:256])
self.magic, self.hdrlen, self.expiry, self.codelen, \ self.magic, self.hdrlen, self.expiry, self.codelen, \
self.vmajor, self.vminor, self.vpatch, self.vbuild, \ self.vmajor, self.vminor, self.vpatch, self.vbuild, \
self.reserved, self.sigidx, self.sig = header self.reserved, self.sigidx, self.sig = header
assert self.magic == b'TRZB' assert self.magic == b'TRZL'
assert self.hdrlen == 256 assert self.hdrlen == 256
assert self.codelen + self.hdrlen >= 4 * 1024 assert self.codelen + self.hdrlen >= 4 * 1024
assert self.codelen + self.hdrlen <= 64 * 1024 + 7 * 128 * 1024 assert self.codelen + self.hdrlen <= 64 * 1024 + 7 * 128 * 1024
@ -51,7 +51,7 @@ class BootloaderImage:
assert len(self.code) == self.codelen assert len(self.code) == self.codelen
def print(self): def print(self):
print('TREZOR Bootloader Image') print('TREZOR Loader Image')
print(' * magic :', self.magic.decode('ascii')) print(' * magic :', self.magic.decode('ascii'))
print(' * hdrlen :', self.hdrlen) print(' * hdrlen :', self.hdrlen)
print(' * expiry :', self.expiry) print(' * expiry :', self.expiry)
@ -213,8 +213,8 @@ def binopen(filename):
print() print()
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
magic = data[:4] magic = data[:4]
if magic == b'TRZB': if magic == b'TRZL':
return BootloaderImage(data) return LoaderImage(data)
if magic == b'TRZV': if magic == b'TRZV':
return VendorHeader(data) return VendorHeader(data)
if magic == b'TRZF': if magic == b'TRZF':