LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 01:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: py3 in bitcoin.py: aes_encrypt_with_iv() and aes_decrypt_with_iv()

Browse source
This commit is contained in:
SomberNight 2017-10-17 06:44:37 +02:00
parent 6b9bfddda2
commit 8a07c2654c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/bitcoin.py
View file

@ -117,7 +117,7 @@ def aes_encrypt_with_iv(key, iv, data):
padlen = 16 - (len(data) % 16) padlen = 16 - (len(data) % 16)
if padlen == 0: if padlen == 0:
padlen = 16 padlen = 16
data += chr(padlen) * padlen data += bytes([padlen]) * padlen
e = AES.new(key, AES.MODE_CBC, iv).encrypt(data) e = AES.new(key, AES.MODE_CBC, iv).encrypt(data)
return e return e
else: else:
@ -131,9 +131,9 @@ def aes_decrypt_with_iv(key, iv, data):
if AES: if AES:
cipher = AES.new(key, AES.MODE_CBC, iv) cipher = AES.new(key, AES.MODE_CBC, iv)
data = cipher.decrypt(data) data = cipher.decrypt(data)
padlen = ord(data[-1]) padlen = data[-1]
for i in data[-padlen:]: for i in data[-padlen:]:
if ord(i) != padlen: if i != padlen:
raise InvalidPassword() raise InvalidPassword()
return data[0:-padlen] return data[0:-padlen]
else: else: