aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

ignore macaroon type errors

Browse source
This commit is contained in:
dni 2022-07-26 09:56:46 +02:00
parent 345cf86544
commit 1c543e3a84
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lnbits/wallets/macaroon/macaroon.py
View file

@ -76,7 +76,7 @@ class AESCipher(object):
def decrypt(self, encrypted: str) -> str: #type: ignore def decrypt(self, encrypted: str) -> str: #type: ignore
"""Decrypts a string using AES-256-CBC.""" """Decrypts a string using AES-256-CBC."""
passphrase = self.passphrase passphrase = self.passphrase
encrypted = base64.b64decode(encrypted) encrypted = base64.b64decode(encrypted) #type: ignore
assert encrypted[0:8] == b"Salted__" assert encrypted[0:8] == b"Salted__"
salt = encrypted[8:16] salt = encrypted[8:16]
key_iv = self.bytes_to_key(passphrase.encode(), salt, 32 + 16) key_iv = self.bytes_to_key(passphrase.encode(), salt, 32 + 16)
@ -84,7 +84,7 @@ class AESCipher(object):
iv = key_iv[32:] iv = key_iv[32:]
aes = AES.new(key, AES.MODE_CBC, iv) aes = AES.new(key, AES.MODE_CBC, iv)
try: try:
return self.unpad(aes.decrypt(encrypted[16:])).decode() return self.unpad(aes.decrypt(encrypted[16:])).decode() #type: ignore
except UnicodeDecodeError: except UnicodeDecodeError:
raise ValueError("Wrong passphrase") raise ValueError("Wrong passphrase")