AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #3211: use bytearray in ledger sign_message

Browse Source
This commit is contained in:
ThomasV
2017-11-05 17:45:55 +01:00
parent 46b8436693
commit 42e2bb5ecc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ledger/ledger.py
View File

@@ -216,6 +216,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
def sign_message(self, sequence, message, password): def sign_message(self, sequence, message, password):
self.signing = True self.signing = True
message = message.encode('utf8')
# prompt for the PIN before displaying the dialog if necessary # prompt for the PIN before displaying the dialog if necessary
client = self.get_client() client = self.get_client()
address_path = self.get_derivation()[2:] + "/%d/%d"%sequence address_path = self.get_derivation()[2:] + "/%d/%d"%sequence
@@ -242,9 +243,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
finally: finally:
self.handler.clear_dialog() self.handler.clear_dialog()
self.signing = False self.signing = False
# Parse the ASN.1 signature # Parse the ASN.1 signature
rLength = signature[3] rLength = signature[3]
r = signature[4 : 4 + rLength] r = signature[4 : 4 + rLength]
sLength = signature[4 + rLength + 1] sLength = signature[4 + rLength + 1]
@@ -253,11 +252,9 @@ class Ledger_KeyStore(Hardware_KeyStore):
r = r[1:] r = r[1:]
if sLength == 33: if sLength == 33:
s = s[1:] s = s[1:]
r = str(r)
s = str(s)
# And convert it # And convert it
return chr(27 + 4 + (signature[0] & 0x01)) + r + s return bytes([27 + 4 + (signature[0] & 0x01)]) + r + s
def sign_transaction(self, tx, password): def sign_transaction(self, tx, password):
if tx.is_complete(): if tx.is_complete():