LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

catch decryption errors and verify seed is valid upon decrypt

Browse source
This commit is contained in:
Jack Robison 2018-11-26 14:01:14 -05:00
parent 56fc003a96
commit ca67c56222
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
torba/client/baseaccount.py
View file

@ -309,11 +309,26 @@ class BaseAccount:
def decrypt(self, password: str) -> None: def decrypt(self, password: str) -> None:
assert self.encrypted, "Key is not encrypted." assert self.encrypted, "Key is not encrypted."
self.seed, self.seed_encryption_init_vector = aes_decrypt(password, self.seed) try:
pk_string, self.private_key_encryption_init_vector = aes_decrypt(password, self.private_key_string) seed, seed_iv = aes_decrypt(password, self.seed)
self.private_key = from_extended_key_string( pk_string, pk_iv = aes_decrypt(password, self.private_key_string)
self.ledger, pk_string except ValueError: # failed to remove padding, password is wrong
) return
try:
Mnemonic().mnemonic_decode(seed)
except IndexError: # failed to decode the seed, this either means it decrypted and is invalid
# or that we hit an edge case where an incorrect password gave valid padding
return
try:
private_key = from_extended_key_string(
self.ledger, pk_string
)
except (TypeError, ValueError):
return
self.seed = seed
self.seed_encryption_init_vector = seed_iv
self.private_key = private_key
self.private_key_encryption_init_vector = pk_iv
self.password = password self.password = password
self.encrypted = False self.encrypted = False