tpython3: fix password decode - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 108d7d39f098a04afc177b5862ecd52e2d824d67
DIR parent 0fdf661845e28a58093b1222988008b2993147d3
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 9 Aug 2017 11:09:56 +0200
python3: fix password decode
Diffstat:
M lib/bitcoin.py | 2 +-
M lib/keystore.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -150,7 +150,7 @@ def DecodeAES(secret, e):
def pw_encode(s, password):
if password:
secret = Hash(password)
- return EncodeAES(secret, to_bytes(s, "utf8"))
+ return EncodeAES(secret, to_bytes(s, "utf8")).decode('utf8')
else:
return s
DIR diff --git a/lib/keystore.py b/lib/keystore.py
t@@ -149,7 +149,7 @@ class Imported_KeyStore(Software_KeyStore):
except Exception:
raise BaseException('Invalid private key')
# allow overwrite
- self.keypairs[pubkey] = pw_encode(sec, password).decode('ascii')
+ self.keypairs[pubkey] = pw_encode(sec, password)
return pubkey
def delete_imported_key(self, key):
t@@ -179,7 +179,7 @@ class Imported_KeyStore(Software_KeyStore):
new_password = None
for k, v in self.keypairs.items():
b = pw_decode(v, old_password)
- c = pw_encode(b, new_password).decode('ascii')
+ c = pw_encode(b, new_password)
self.keypairs[k] = c
t@@ -309,13 +309,13 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
new_password = None
if self.has_seed():
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:
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:
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):
return self.xprv is None
t@@ -478,7 +478,7 @@ class Old_KeyStore(Deterministic_KeyStore):
new_password = None
if self.has_seed():
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):