tutf8 encoding for seed encryption - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c76da17262be082828224e10399f258324886368
DIR parent 430c7aa92ed625605f9f54d464c6d1623c2a99f9
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 4 May 2014 20:31:05 +0200
utf8 encoding for seed encryption
Diffstat:
M lib/bitcoin.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -30,7 +30,7 @@ DecodeAES = lambda secret, e: aes.decryptData(secret, base64.b64decode(e))
def pw_encode(s, password):
if password:
secret = Hash(password)
- return EncodeAES(secret, s)
+ return EncodeAES(secret, s.encode("utf8"))
else:
return s
t@@ -38,7 +38,7 @@ def pw_decode(s, password):
if password is not None:
secret = Hash(password)
try:
- d = DecodeAES(secret, s)
+ d = DecodeAES(secret, s).decode("utf8")
except Exception:
raise Exception('Invalid password')
return d
t@@ -301,7 +301,6 @@ def public_key_from_private_key(sec):
pkey = regenerate_key(sec)
assert pkey
compressed = is_compressed(sec)
- print "is compressed", compressed
public_key = GetPubKey(pkey.pubkey, compressed)
return public_key.encode('hex')