Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

support unlocking with blank password but throw an error when encrypting with blank password

Browse source
This commit is contained in:
Lex Berezhny 2019-10-18 12:40:57 -04:00
parent afe24a3e65
commit 180035296e
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
torba/torba/client/wallet.py
View file

@ -206,11 +206,17 @@ class Wallet:
return False return False
def unlock(self, password): def unlock(self, password):
self.encryption_password = password
for account in self.accounts: for account in self.accounts:
if account.encrypted: if account.encrypted:
if not account.decrypt(password): if not account.decrypt(password):
return False return False
if password == "":
# for backwards compatiblity:
# some accounts were encrypted with blank password, this allows
# those accounts to be unlocked but then not encrypted anymore
self.decrypt()
else:
self.encryption_password = password
return True return True
def lock(self): def lock(self):
@ -232,6 +238,8 @@ class Wallet:
def encrypt(self, password): def encrypt(self, password):
assert not self.is_locked, "Cannot re-encrypt a locked wallet, unlock first." assert not self.is_locked, "Cannot re-encrypt a locked wallet, unlock first."
if not password:
raise ValueError("Cannot encrypt with blank password.")
self.encryption_password = password self.encryption_password = password
self.preferences[ENCRYPT_ON_DISK] = True self.preferences[ENCRYPT_ON_DISK] = True
self.save() self.save()