arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-25 17:09:44 +00:00
Code Issues Releases Wiki Activity

tools/binctl: python2 compatibility

Browse Source
This commit is contained in:
Jan Pochyla 2017-08-07 11:50:12 +02:00
parent 1c9b6d44b4
commit 71ef4e4b3a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/binctl
View File

@ -1,4 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python
from __future__ import print_function
import sys import sys
import struct import struct
import binascii import binascii
@ -19,7 +22,7 @@ def format_sigmask(sigmask):
# bootloader/firmware headers specification: https://github.com/trezor/trezor-core/blob/master/docs/bootloader.md # bootloader/firmware headers specification: https://github.com/trezor/trezor-core/blob/master/docs/bootloader.md
class BinImage: class BinImage(object):
def __init__(self, data, magic, max_size): def __init__(self, data, magic, max_size):
header = struct.unpack('<4sIIIBBBB427sB64s', data[:512]) header = struct.unpack('<4sIIIBBBB427sB64s', data[:512])
@ -91,7 +94,7 @@ class BinImage:
class FirmwareImage(BinImage): class FirmwareImage(BinImage):
def __init__(self, data, vhdrlen): def __init__(self, data, vhdrlen):
super().__init__(data[vhdrlen:], magic=b'TRZF', max_size=7*128*1024) super(FirmwareImage, self).__init__(data[vhdrlen:], magic=b'TRZF', max_size=7*128*1024)
self.vhdrlen = vhdrlen self.vhdrlen = vhdrlen
self.vheader = data[:vhdrlen] self.vheader = data[:vhdrlen]
@ -104,10 +107,10 @@ class FirmwareImage(BinImage):
class BootloaderImage(BinImage): class BootloaderImage(BinImage):
def __init__(self, data): def __init__(self, data):
super().__init__(data, magic=b'TRZB', max_size=64*1024 + 7*128*1024) super(BootloaderImage, self).__init__(data, magic=b'TRZB', max_size=64*1024 + 7*128*1024)
class VendorHeader: class VendorHeader(object):
def __init__(self, data): def __init__(self, data):
header = struct.unpack('<4sIIBBBB', data[:16]) header = struct.unpack('<4sIIBBBB', data[:16])
@ -187,6 +190,7 @@ class VendorHeader:
def binopen(filename): def binopen(filename):
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
data = bytearray(data) # python2/3 compatibility
magic = data[:4] magic = data[:4]
if magic == b'TRZB': if magic == b'TRZB':
return BootloaderImage(data) return BootloaderImage(data)