AaronFiore/electrum
1
0
Fork 0
Code Activity

Fix trezor restore

Browse Source 
Broken by my recent changes
This commit is contained in:
Neil Booth
2015-12-27 15:38:52 +09:00
parent 7372e0e082
commit 669cf74789
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/wallet.py
View File

@@ -26,6 +26,7 @@ import json
import copy
from functools import partial
from struct import pack
from unicodedata import normalize
from i18n import _
from util import NotEnoughFunds, PrintError, profiler
@@ -1764,8 +1765,8 @@ class BIP32_Hardware_Wallet(BIP32_HD_Wallet):
# trezor uses bip39
import pbkdf2, hashlib, hmac
PBKDF2_ROUNDS = 2048
mnemonic = unicodedata.normalize('NFKD', ' '.join(mnemonic.split()))
passphrase = unicodedata.normalize('NFKD', passphrase)
mnemonic = normalize('NFKD', ' '.join(mnemonic.split()))
passphrase = normalize('NFKD', passphrase)
return pbkdf2.PBKDF2(mnemonic, 'mnemonic' + passphrase,
iterations = PBKDF2_ROUNDS, macmodule = hmac,
digestmodule = hashlib.sha512).read(64)