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

further cleanup of normalize_nfc usage

Browse Source
This commit is contained in:
matejcik 2018-03-06 13:58:39 +01:00 committed by matejcik
parent a1dba05a46
commit c0d2af557c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
trezorlib/client.py
View File

@ -188,11 +188,13 @@ def session(f):
def normalize_nfc(txt): def normalize_nfc(txt):
'''
Normalize message to NFC and return bytes suitable for protobuf.
This seems to be bitcoin-qt standard of doing things.
'''
if isinstance(txt, bytes): if isinstance(txt, bytes):
return unicodedata.normalize('NFC', txt.decode('utf-8')) txt = txt.decode('utf-8')
if isinstance(txt, str): return unicodedata.normalize('NFC', txt).encode('utf-8')
return unicodedata.normalize('NFC', txt)
raise ValueError('expected str or bytes argument')
class BaseClient(object): class BaseClient(object):
@ -602,13 +604,11 @@ class ProtocolMixin(object):
@expect(proto.EthereumMessageSignature) @expect(proto.EthereumMessageSignature)
def ethereum_sign_message(self, n, message): def ethereum_sign_message(self, n, message):
n = self._convert_prime(n) n = self._convert_prime(n)
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard) message = normalize_nfc(message)
message = normalize_nfc(message).encode('utf-8')
return self.call(proto.EthereumSignMessage(address_n=n, message=message)) return self.call(proto.EthereumSignMessage(address_n=n, message=message))
def ethereum_verify_message(self, address, signature, message): def ethereum_verify_message(self, address, signature, message):
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard) message = normalize_nfc(message)
message = normalize_nfc(message).encode('utf-8')
try: try:
resp = self.call(proto.EthereumVerifyMessage(address=address, signature=signature, message=message)) resp = self.call(proto.EthereumVerifyMessage(address=address, signature=signature, message=message))
except CallException as e: except CallException as e:
@ -673,8 +673,7 @@ class ProtocolMixin(object):
@expect(proto.MessageSignature) @expect(proto.MessageSignature)
def sign_message(self, coin_name, n, message, script_type=proto.InputScriptType.SPENDADDRESS): def sign_message(self, coin_name, n, message, script_type=proto.InputScriptType.SPENDADDRESS):
n = self._convert_prime(n) n = self._convert_prime(n)
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard) message = normalize_nfc(message)
message = normalize_nfc(message).encode('utf-8')
return self.call(proto.SignMessage(coin_name=coin_name, address_n=n, message=message, script_type=script_type)) return self.call(proto.SignMessage(coin_name=coin_name, address_n=n, message=message, script_type=script_type))
@expect(proto.SignedIdentity) @expect(proto.SignedIdentity)
@ -827,8 +826,7 @@ class ProtocolMixin(object):
return self.call(msg) return self.call(msg)
def verify_message(self, coin_name, address, signature, message): def verify_message(self, coin_name, address, signature, message):
# Convert message to UTF8 NFC (seems to be a bitcoin-qt standard) message = normalize_nfc(message)
message = normalize_nfc(message).encode('utf-8')
try: try:
resp = self.call(proto.VerifyMessage(address=address, signature=signature, message=message, coin_name=coin_name)) resp = self.call(proto.VerifyMessage(address=address, signature=signature, message=message, coin_name=coin_name))
except CallException as e: except CallException as e: