arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-31 10:30:58 +00:00
Code Issues Releases Wiki Activity

ButtonAck sent over recursion call, like other *Ack

Browse Source
This commit is contained in:
slush 2013-01-14 17:04:58 +01:00
parent 9b4359fe01
commit 1c78397c1b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bitkeylib/client.py
View File

@ -10,6 +10,15 @@ def show_input(input_text, message=None):
print "QUESTION FROM DEVICE:", message
return raw_input(input_text)
class CallException(Exception):
pass
class PinException(CallException):
pass
class OtpException(CallException):
pass
class BitkeyClient(object):
def __init__(self, transport, debuglink=None,
@ -65,9 +74,8 @@ class BitkeyClient(object):
if self.debuglink and self.debug_button:
print "Pressing button", self.debug_button
self.debuglink.press_button(self.debug_button)
self.transport.write(proto.ButtonAck())
resp = self.transport.read_blocking()
return self.call(proto.ButtonAck())
if isinstance(resp, proto.OtpRequest):
if self.debuglink:
@ -99,15 +107,15 @@ class BitkeyClient(object):
self.message_func(resp.message)
if resp.code == 3:
raise Exception("OTP is invalid")
raise OtpException("OTP is invalid")
elif resp.code == 4:
raise Exception("Action cancelled by user")
raise CallException("Action cancelled by user")
elif resp.code == 6:
raise Exception("PIN is invalid")
raise PinException("PIN is invalid")
raise Exception(resp.code, resp.message)
raise CallException(resp.code, resp.message)
if self.debug:
print "Received", self._pprint(resp)