From 443ffab619789a17876e21094832544e2288b217 Mon Sep 17 00:00:00 2001
From: slush0 <slush@satoshilabs.com>
Date: Fri, 21 Feb 2014 02:30:10 +0100
Subject: [PATCH] Added utf8 handling to sign_message/verify_message

---
 trezorlib/client.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/trezorlib/client.py b/trezorlib/client.py
index 1b039d0417..b08eea2faa 100644
--- a/trezorlib/client.py
+++ b/trezorlib/client.py
@@ -1,6 +1,7 @@
 import os
 import binascii
 import hashlib
+import unicodedata
 
 import tools
 import messages_pb2 as proto
@@ -55,6 +56,17 @@ class expect(object):
             return ret
         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):
     # Implements very basic layer of sending raw protobuf
     # messages to device and getting its response back.
@@ -329,11 +341,24 @@ class ProtocolMixin(object):
         return ret
 
     @expect(proto.MessageSignature)
-    def sign_message(self, n, message):
+    def sign_message(self, coin_name, n, message):
         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):
+        # 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:
             resp = self.call(proto.VerifyMessage(address=address, signature=signature, message=message))
         except CallException as e: