AaronFiore/electrum
1
0
Fork 0
Code Activity

bugfix: encryption of encrypted keys

Browse Source
This commit is contained in:
ThomasV
2012-05-17 08:32:49 +02:00
parent ef0809a1df
commit 1181f4ef01
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gui.py
View File

@@ -530,7 +530,7 @@ def change_password_dialog(wallet, parent, icon):
show_message("passwords do not match")
return
wallet.update_password(seed, new_password)
wallet.update_password(seed, password, new_password)
if icon:
if wallet.use_encryption:

2
lib/gui_qt.py
View File

@@ -938,7 +938,7 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(parent, 'Error', 'Passwords do not match', 'OK')
return
wallet.update_password(seed, new_password)
wallet.update_password(seed, password, new_password)
@staticmethod
def seed_dialog(wallet, parent=None):

4
lib/wallet.py
View File

@@ -847,13 +847,13 @@ class Wallet:
return target, signing_addr, auth_name
def update_password(self, seed, new_password):
def update_password(self, seed, old_password, new_password):
if new_password == '': new_password = None
self.use_encryption = (new_password != None)
self.seed = self.pw_encode( seed, new_password)
for k in self.imported_keys.keys():
a = self.imported_keys[k]
b = self.pw_decode(a, password)
b = self.pw_decode(a, old_password)
c = self.pw_encode(b, new_password)
self.imported_keys[k] = c
self.save()