arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-19 14:08:11 +00:00
Code Issues Releases Wiki Activity

fixes for v2 wire

Browse Source
This commit is contained in:
Jan Pochyla 2016-08-05 13:07:04 +02:00 committed by Pavol Rusnak
parent 096f3f898f
commit d6592a48e6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/trezor/wire.py
View File

@ -20,8 +20,8 @@ IFACE = const(0)
_REPORT_LEN = const(64) _REPORT_LEN = const(64)
_MAX_DATA_LEN = const(65536) _MAX_DATA_LEN = const(65536)
_HEADER_MAGIC = const(35) # ord('#') _HEADER_MAGIC = const(33) # ord('!')
_DATA_MAGIC = const(33) # ord('!') _DATA_MAGIC = const(35) # ord('#')
def _read_report(): def _read_report():
@ -64,7 +64,8 @@ def read_wire_msg():
csum = ustruct.unpack_from('>L', buffered, -4) csum = ustruct.unpack_from('>L', buffered, -4)
# Compare the checksums # Compare the checksums
assert csum == ubinascii.crc32(mbuf), 'Message checksum mismatch' if hasattr(ubinascii, 'crc32'):
assert csum == ubinascii.crc32(mbuf), 'Message checksum mismatch'
return sid, mtype, mbuf return sid, mtype, mbuf
@ -78,7 +79,10 @@ def write_wire_msg(sid, mtype, mbuf):
mbuf = memoryview(mbuf) mbuf = memoryview(mbuf)
data = rep[13:] # Skip magic and header data = rep[13:] # Skip magic and header
csum = ubinascii.crc32(mbuf) if hasattr(ubinascii, 'crc32'):
csum = ubinascii.crc32(mbuf)
else:
csum = 0
footer = ustruct.pack('>L', csum) footer = ustruct.pack('>L', csum)
while True: while True:
@ -88,8 +92,9 @@ def write_wire_msg(sid, mtype, mbuf):
data = data[n:] # Skip written bytes data = data[n:] # Skip written bytes
# Continue with the footer if mbuf is empty and we have space # Continue with the footer if mbuf is empty and we have space
if not mbuf and data: if not mbuf and footer and data:
mbuf = footer mbuf = footer
footer = None
continue continue
yield from _write_report(rep) yield from _write_report(rep)
@ -97,6 +102,7 @@ def write_wire_msg(sid, mtype, mbuf):
break break
# Reset to skip the magic and session ID # Reset to skip the magic and session ID
rep[0] = _DATA_MAGIC
data = rep[5:] data = rep[5:]