arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-17 01:52:02 +00:00
Code Issues Releases Wiki Activity

trezorhal: fix alignment in headers to 512 bytes

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-31 23:54:59 +02:00
parent f13c122561
commit b5ff140256
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/bootloader.md
View File

@ -35,7 +35,7 @@ TREZOR Core (second stage) loader consists of 2 parts:
### Loader Header ### Loader Header
Total length of loader header is always 256 bytes. Total length of loader header is always 512 bytes.
| offset | length | name | description | | offset | length | name | description |
|-------:|-------:|------|-------------| |-------:|-------:|------|-------------|
@ -47,9 +47,9 @@ Total length of loader header is always 256 bytes.
| 0x0011 | 1 | vminor | version (minor) | | 0x0011 | 1 | vminor | version (minor) |
| 0x0012 | 1 | vpatch | version (patch) | | 0x0012 | 1 | vpatch | version (patch) |
| 0x0013 | 1 | vbuild | version (build) | | 0x0013 | 1 | vbuild | version (build) |
| 0x0014 | 171 | reserved | not used yet (zeroed) | | 0x0014 | 427 | reserved | not used yet (zeroed) |
| 0x00BF | 1 | sigidx | SatoshiLabs signature indexes (bitmap) | | 0x01BF | 1 | sigidx | SatoshiLabs signature indexes (bitmap) |
| 0x00C0 | 64 | sig | SatoshiLabs signature | | 0x01C0 | 64 | sig | SatoshiLabs signature |
## Firmware Format ## Firmware Format
@ -61,7 +61,7 @@ TREZOR Core firmware consists of 3 parts:
### Vendor Header ### Vendor Header
Total length of vendor header is 84 + 32 * (number of pubkeys) + (length of vendor string) + (length of vendor image) bytes rounded up to the closest multiply of 256 bytes. Total length of vendor header is 84 + 32 * (number of pubkeys) + (length of vendor string) + (length of vendor image) bytes rounded up to the closest multiply of 512 bytes.
| offset | length | name | description | | offset | length | name | description |
|-------:|-------:|------|-------------| |-------:|-------:|------|-------------|
@ -84,7 +84,7 @@ Total length of vendor header is 84 + 32 * (number of pubkeys) + (length of vend
### Firmware Header ### Firmware Header
Total length of firmware header is always 256 bytes. Total length of firmware header is always 512 bytes.
| offset | length | name | description | | offset | length | name | description |
|-------:|-------:|------|-------------| |-------:|-------:|------|-------------|
@ -96,9 +96,9 @@ Total length of firmware header is always 256 bytes.
| 0x0011 | 1 | vminor | version (minor) | | 0x0011 | 1 | vminor | version (minor) |
| 0x0012 | 1 | vpatch | version (patch) | | 0x0012 | 1 | vpatch | version (patch) |
| 0x0013 | 1 | vbuild | version (build) | | 0x0013 | 1 | vbuild | version (build) |
| 0x0014 | 171 | reserved | not used yet (zeroed) | | 0x0014 | 427 | reserved | not used yet (zeroed) |
| 0x00BF | 1 | sigidx | vendor signature indexes (bitmap) | | 0x01BF | 1 | sigidx | vendor signature indexes (bitmap) |
| 0x00C0 | 64 | sig | vendor signature | | 0x01C0 | 64 | sig | vendor signature |
## Various ideas ## Various ideas

18
tools/binctl
View File

@ -22,7 +22,7 @@ def get_sig(data):
class LoaderImage: class LoaderImage:
def __init__(self, data): def __init__(self, data):
header = struct.unpack('<4sIIIBBBB171sB64s', data[:256]) header = struct.unpack('<4sIIIBBBB427sB64s', data[:512])
self.magic, \ self.magic, \
self.hdrlen, \ self.hdrlen, \
self.expiry, \ self.expiry, \
@ -35,11 +35,11 @@ class LoaderImage:
self.sigidx, \ self.sigidx, \
self.sig = header self.sig = header
assert self.magic == b'TRZL' assert self.magic == b'TRZL'
assert self.hdrlen == 256 assert self.hdrlen == 512
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
assert (self.codelen + self.hdrlen) % 512 == 0 assert (self.codelen + self.hdrlen) % 512 == 0
assert self.reserved == 171 * b'\x00' assert self.reserved == 427 * b'\x00'
self.code = data[self.hdrlen:] self.code = data[self.hdrlen:]
assert len(self.code) == self.codelen assert len(self.code) == self.codelen
@ -54,7 +54,7 @@ class LoaderImage:
print(' * sig :', binascii.hexlify(self.sig).decode('ascii')) print(' * sig :', binascii.hexlify(self.sig).decode('ascii'))
def serialize_header(self, sig=True): def serialize_header(self, sig=True):
header = struct.pack('<4sIIIBBBB171s', \ header = struct.pack('<4sIIIBBBB427s', \
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.reserved)
@ -155,7 +155,7 @@ class VendorHeader:
class FirmwareImage: class FirmwareImage:
def __init__(self, data): def __init__(self, data):
header = struct.unpack('<4sIIIBBBB171sB64s', data[:256]) header = struct.unpack('<4sIIIBBBB427sB64s', data[:512])
self.magic, \ self.magic, \
self.hdrlen, \ self.hdrlen, \
self.expiry, \ self.expiry, \
@ -168,9 +168,9 @@ class FirmwareImage:
self.sigidx, \ self.sigidx, \
self.sig = header self.sig = header
assert self.magic == b'TRZF' assert self.magic == b'TRZF'
assert self.hdrlen == 256 assert self.hdrlen == 512
assert self.codelen % 4 == 0 assert self.codelen % 4 == 0
assert self.reserved == 171 * b'\x00' assert self.reserved == 427 * b'\x00'
self.code = data[self.hdrlen:] self.code = data[self.hdrlen:]
assert len(self.code) == self.codelen assert len(self.code) == self.codelen
@ -185,7 +185,7 @@ class FirmwareImage:
print(' * sig :', binascii.hexlify(self.sig).decode('ascii')) print(' * sig :', binascii.hexlify(self.sig).decode('ascii'))
def serialize_header(self, sig=True): def serialize_header(self, sig=True):
header = struct.pack('<4sIIIBBBB171s', \ header = struct.pack('<4sIIIBBBB427s', \
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.reserved)
@ -225,7 +225,7 @@ def binopen(filename):
def main(): def main():
if len(sys.argv) < 2: if len(sys.argv) < 2:
print('Usage: firmwarectl file.bin [-s]') print('Usage: binctl file.bin [-s]')
return 1 return 1
fn = sys.argv[1] fn = sys.argv[1]
sign = len(sys.argv) > 2 and sys.argv[2] == '-s' sign = len(sys.argv) > 2 and sys.argv[2] == '-s'