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

dont error if blank password was set previously

Browse source
This commit is contained in:
Lex Berezhny 2019-10-22 09:41:04 -04:00
parent 21d291531e
commit a7f8febed7
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,7 @@ class Wallet:
def save(self): def save(self):
if self.preferences.get(ENCRYPT_ON_DISK, False): if self.preferences.get(ENCRYPT_ON_DISK, False):
if self.encryption_password: if self.encryption_password is not None:
return self.storage.write(self.to_dict(encrypt_password=self.encryption_password)) return self.storage.write(self.to_dict(encrypt_password=self.encryption_password))
elif not self.is_locked: elif not self.is_locked:
log.warning( log.warning(
@ -155,7 +155,7 @@ class Wallet:
def hash(self) -> bytes: def hash(self) -> bytes:
h = sha256() h = sha256()
if self.preferences.get(ENCRYPT_ON_DISK, False): if self.preferences.get(ENCRYPT_ON_DISK, False):
assert self.encryption_password, \ assert self.encryption_password is not None, \
"Encryption is enabled but no password is available, cannot generate hash." "Encryption is enabled but no password is available, cannot generate hash."
h.update(self.encryption_password.encode()) h.update(self.encryption_password.encode())
h.update(self.preferences.hash) h.update(self.preferences.hash)
@ -209,13 +209,7 @@ class Wallet:
if account.encrypted: if account.encrypted:
if not account.decrypt(password): if not account.decrypt(password):
return False return False
if password == "": self.encryption_password = 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):