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

fix aes_encrypt not prepending the iv

Browse source 
-allow random iv to be overridden
This commit is contained in:
Jack Robison 2018-09-18 14:32:33 -04:00 committed by Lex Berezhny
parent 53e0fe9a69
commit 4832526477
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
torba/hash.py
View file

@ -106,14 +106,17 @@ def hex_str_to_hash(x):
return reversed(unhexlify(x)) return reversed(unhexlify(x))
def aes_encrypt(secret, value): def aes_encrypt(secret, value, iv=None):
if iv:
assert len(iv) == 16
else:
iv = os.urandom(16)
key = double_sha256(secret) key = double_sha256(secret)
init_vector = os.urandom(16) encryptor = Cipher(AES(key), modes.CBC(iv), default_backend()).encryptor()
encryptor = Cipher(AES(key), modes.CBC(init_vector), default_backend()).encryptor()
padder = PKCS7(AES.block_size).padder() padder = PKCS7(AES.block_size).padder()
padded_data = padder.update(value) + padder.finalize() padded_data = padder.update(value) + padder.finalize()
encrypted_data2 = encryptor.update(padded_data) + encryptor.finalize() encrypted_data = encryptor.update(padded_data) + encryptor.finalize()
return base64.b64encode(encrypted_data2) return base64.b64encode(iv + encrypted_data)
def aes_decrypt(secret, value): def aes_decrypt(secret, value):