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

Added utf8 handling to sign_message/verify_message

Browse Source
This commit is contained in:
slush0 2014-02-21 02:30:10 +01:00
parent 747e58ebf7
commit 443ffab619
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
trezorlib/client.py
View File

@ -1,6 +1,7 @@
import os import os
import binascii import binascii
import hashlib import hashlib
import unicodedata
import tools import tools
import messages_pb2 as proto import messages_pb2 as proto
@ -55,6 +56,17 @@ class expect(object):
return ret return ret
return wrapped_f return wrapped_f
def normalize_nfc(txt):
# Normalize string to UTF8 NFC for sign_message
if isinstance(txt, str):
utxt = txt.decode('utf8')
elif isinstance(txt, unicode):
utxt = txt
else:
raise Exception("String value expected")
return unicodedata.normalize('NFC', utxt)
class BaseClient(object): class BaseClient(object):
# Implements very basic layer of sending raw protobuf # Implements very basic layer of sending raw protobuf
# messages to device and getting its response back. # messages to device and getting its response back.
@ -329,11 +341,24 @@ class ProtocolMixin(object):
return ret return ret
@expect(proto.MessageSignature) @expect(proto.MessageSignature)
def sign_message(self, n, message): def sign_message(self, coin_name, n, message):
n = self._convert_prime(n) n = self._convert_prime(n)
return self.call(proto.SignMessage(address_n=n, message=message))
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard)
message = normalize_nfc(message)
# Convert message to ASCII stream
message = str(bytearray(message, 'utf-8'))
return self.call(proto.SignMessage(coin_name=coin_name, address_n=n, message=message))
def verify_message(self, address, signature, message): def verify_message(self, address, signature, message):
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard)
message = normalize_nfc(message)
# Convert message to ASCII stream
message = str(bytearray(message, 'utf-8'))
try: try:
resp = self.call(proto.VerifyMessage(address=address, signature=signature, message=message)) resp = self.call(proto.VerifyMessage(address=address, signature=signature, message=message))
except CallException as e: except CallException as e: