AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #1954

Browse Source
This commit is contained in:
ThomasV
2016-10-07 00:20:46 +02:00
parent 21ad805010
commit 9cafc3db2d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/keystore.py
View File

@@ -186,15 +186,13 @@ class Imported_KeyStore(Software_KeyStore):
return (False, i) return (False, i)
def update_password(self, old_password, new_password): def update_password(self, old_password, new_password):
if old_password is not None: self.check_password(old_password)
self.check_password(old_password)
if new_password == '': if new_password == '':
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) c = pw_encode(b, new_password)
self.keypairs[k] = c self.keypairs[k] = c
print self.keypairs
class Deterministic_KeyStore(Software_KeyStore): class Deterministic_KeyStore(Software_KeyStore):
@@ -317,8 +315,7 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
raise InvalidPassword() raise InvalidPassword()
def update_password(self, old_password, new_password): def update_password(self, old_password, new_password):
if old_password is not None: self.check_password(old_password)
self.check_password(old_password)
if new_password == '': if new_password == '':
new_password = None new_password = None
if self.has_seed(): if self.has_seed():
@@ -485,8 +482,7 @@ class Old_KeyStore(Deterministic_KeyStore):
return derivation return derivation
def update_password(self, old_password, new_password): def update_password(self, old_password, new_password):
if old_password is not None: self.check_password(old_password)
self.check_password(old_password)
if new_password == '': if new_password == '':
new_password = None new_password = None
if self.has_seed(): if self.has_seed():