AaronFiore/electrum
1
0
Fork 0
Code Activity

python3: fix password decode

Browse Source
This commit is contained in:
ThomasV
2017-08-09 11:09:56 +02:00
parent 0fdf661845
commit 108d7d39f0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bitcoin.py
View File

@@ -150,7 +150,7 @@ def DecodeAES(secret, e):
def pw_encode(s, password): def pw_encode(s, password):
if password: if password:
secret = Hash(password) secret = Hash(password)
return EncodeAES(secret, to_bytes(s, "utf8")) return EncodeAES(secret, to_bytes(s, "utf8")).decode('utf8')
else: else:
return s return s

12
lib/keystore.py
View File

@@ -149,7 +149,7 @@ class Imported_KeyStore(Software_KeyStore):
except Exception: except Exception:
raise BaseException('Invalid private key') raise BaseException('Invalid private key')
# allow overwrite # allow overwrite
self.keypairs[pubkey] = pw_encode(sec, password).decode('ascii') self.keypairs[pubkey] = pw_encode(sec, password)
return pubkey return pubkey
def delete_imported_key(self, key): def delete_imported_key(self, key):
@@ -179,7 +179,7 @@ class Imported_KeyStore(Software_KeyStore):
new_password = None new_password = None
for k, v in self.keypairs.items(): for k, v in self.keypairs.items():
b = pw_decode(v, old_password) b = pw_decode(v, old_password)
c = pw_encode(b, new_password).decode('ascii') c = pw_encode(b, new_password)
self.keypairs[k] = c self.keypairs[k] = c
@@ -309,13 +309,13 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
new_password = None new_password = None
if self.has_seed(): if self.has_seed():
decoded = self.get_seed(old_password) decoded = self.get_seed(old_password)
self.seed = pw_encode(decoded, new_password).decode('ascii') self.seed = pw_encode(decoded, new_password)
if self.passphrase: if self.passphrase:
decoded = self.get_passphrase(old_password) decoded = self.get_passphrase(old_password)
self.passphrase = pw_encode(decoded, new_password).decode('ascii') self.passphrase = pw_encode(decoded, new_password)
if self.xprv is not None: if self.xprv is not None:
b = pw_decode(self.xprv, old_password) b = pw_decode(self.xprv, old_password)
self.xprv = pw_encode(b, new_password).decode('ascii') self.xprv = pw_encode(b, new_password)
def is_watching_only(self): def is_watching_only(self):
return self.xprv is None return self.xprv is None
@@ -478,7 +478,7 @@ class Old_KeyStore(Deterministic_KeyStore):
new_password = None new_password = None
if self.has_seed(): if self.has_seed():
decoded = self.get_hex_seed(old_password) decoded = self.get_hex_seed(old_password)
self.seed = pw_encode(decoded, new_password).decode('ascii') self.seed = pw_encode(decoded, new_password)
class Hardware_KeyStore(KeyStore, Xpub): class Hardware_KeyStore(KeyStore, Xpub):