arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-04 13:38:28 +00:00
Code Issues Releases Wiki Activity

Improved utf8 handling

Browse Source
This commit is contained in:
slush0 2014-02-21 01:48:11 +01:00
parent fabb952327
commit 58dee1a986
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
trezorlib/client.py
View File

@ -6,6 +6,7 @@ import tools
import messages_pb2 as proto import messages_pb2 as proto
import types_pb2 as types import types_pb2 as types
from trezorlib.debuglink import DebugLink from trezorlib.debuglink import DebugLink
from mnemonic import Mnemonic
# monkeypatching: text formatting of protobuf messages # monkeypatching: text formatting of protobuf messages
tools.monkeypatch_google_protobuf_text_format() tools.monkeypatch_google_protobuf_text_format()
@ -128,6 +129,8 @@ class TextUIMixin(object):
def callback_PassphraseRequest(self, msg): def callback_PassphraseRequest(self, msg):
passphrase = raw_input("Passphrase required: ") passphrase = raw_input("Passphrase required: ")
passphrase = str(bytearray(passphrase, 'utf-8'))
return proto.PassphraseAck(passphrase=passphrase) return proto.PassphraseAck(passphrase=passphrase)
def callback_WordRequest(self, msg): def callback_WordRequest(self, msg):
@ -174,7 +177,7 @@ class DebugLinkMixin(object):
self.pin_correct = pin_correct self.pin_correct = pin_correct
def set_passphrase(self, passphrase): def set_passphrase(self, passphrase):
self.passphrase = passphrase self.passphrase = str(bytearray(passphrase, 'utf-8'))
def call_raw(self, msg): def call_raw(self, msg):
resp = super(DebugLinkMixin, self).call_raw(msg) resp = super(DebugLinkMixin, self).call_raw(msg)
@ -426,14 +429,25 @@ class ProtocolMixin(object):
@field('message') @field('message')
@expect(proto.Success) @expect(proto.Success)
def load_device_by_mnemonic(self, mnemonic, pin, passphrase_protection, label, language): def load_device_by_mnemonic(self, mnemonic, pin, passphrase_protection, label, language, skip_checksum=False):
m = Mnemonic('english')
if not skip_checksum and not m.check(mnemonic):
raise Exception("Invalid mnemonic checksum")
# Convert mnemonic to UTF8 NKFD
mnemonic = Mnemonic.normalize_string(mnemonic)
# Convert mnemonic to ASCII stream
mnemonic = str(bytearray(mnemonic, 'utf-8'))
if self.features.initialized: if self.features.initialized:
raise Exception("Device is initialized already. Call wipe_device() and try again.") raise Exception("Device is initialized already. Call wipe_device() and try again.")
resp = self.call(proto.LoadDevice(mnemonic=mnemonic, pin=pin, resp = self.call(proto.LoadDevice(mnemonic=mnemonic, pin=pin,
passphrase_protection=passphrase_protection, passphrase_protection=passphrase_protection,
language=language, language=language,
label=label)) label=label,
skip_checksum=skip_checksum))
self.init_device() self.init_device()
return resp return resp