More Python 3 tweaks

This commit is contained in:
BTChip github 2018-03-12 11:55:08 +01:00
parent 01ac906758
commit ede307f9d0
No known key found for this signature in database
GPG Key ID: 48BCF826EBFA4D17
2 changed files with 4 additions and 3 deletions

View File

@ -311,13 +311,13 @@ class HexLoader:
bootadr |= 1 bootadr |= 1
data = b'\x09' + struct.pack('>I', bootadr) data = b'\x09' + struct.pack('>I', bootadr)
if (signature != None): if (signature != None):
data += chr(len(signature)) + signature data += struct.pack('>B', len(signature)) + signature
self.exchange(self.cla, 0x00, 0x00, 0x00, data) self.exchange(self.cla, 0x00, 0x00, 0x00, data)
def commit(self, signature=None): def commit(self, signature=None):
data = b'\x09' data = b'\x09'
if (signature != None): if (signature != None):
data += chr(len(signature)) + signature data += struct.pack('>B', len(signature)) + signature
self.exchange(self.cla, 0x00, 0x00, 0x00, data) self.exchange(self.cla, 0x00, 0x00, 0x00, data)
def createAppNoInstallParams(self, appflags, applength, appname, icon=None, path=None, iconOffset=None, iconSize=None, appversion=None): def createAppNoInstallParams(self, appflags, applength, appname, icon=None, path=None, iconOffset=None, iconSize=None, appversion=None):

View File

@ -56,12 +56,13 @@ def auto_int(x):
return int(x, 0) return int(x, 0)
def parse_bip32_path(path, apilevel): def parse_bip32_path(path, apilevel):
import struct
if len(path) == 0: if len(path) == 0:
return b"" return b""
result = b"" result = b""
elements = path.split('/') elements = path.split('/')
if apilevel >= 5: if apilevel >= 5:
result = result + chr(len(elements)) result = result + struct.pack('>B', len(elements))
for pathElement in elements: for pathElement in elements:
element = pathElement.split('\'') element = pathElement.split('\'')
if len(element) == 1: if len(element) == 1: