hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Switch to 12 byte IV

Browse Source
This commit is contained in:
Philipp Hörist
2020-02-14 17:10:37 +01:00
parent dfcc7f4999
commit 25cba9eea7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
omemo/backend/aes.py
View File

@@ -28,6 +28,7 @@ log = logging.getLogger('gajim.p.omemo')
EncryptionResult = namedtuple('EncryptionResult', 'payload key iv') EncryptionResult = namedtuple('EncryptionResult', 'payload key iv')
IV_SIZE = 12
def _decrypt(key, iv, tag, data): def _decrypt(key, iv, tag, data):
decryptor = Cipher( decryptor = Cipher(
@@ -60,7 +61,7 @@ def aes_decrypt_file(key, iv, payload):
return _decrypt(key, iv, tag, data) return _decrypt(key, iv, tag, data)
def _encrypt(data, key_size, iv_size): def _encrypt(data, key_size, iv_size=IV_SIZE):
if isinstance(data, str): if isinstance(data, str):
data = data.encode() data = data.encode()
key = os.urandom(key_size) key = os.urandom(key_size)
@@ -75,13 +76,13 @@ def _encrypt(data, key_size, iv_size):
def aes_encrypt(plaintext): def aes_encrypt(plaintext):
key, iv, tag, payload = _encrypt(plaintext, 16, 16) key, iv, tag, payload = _encrypt(plaintext, 16)
key += tag key += tag
return EncryptionResult(payload=payload, key=key, iv=iv) return EncryptionResult(payload=payload, key=key, iv=iv)
def aes_encrypt_file(data): def aes_encrypt_file(data):
key, iv, tag, payload, = _encrypt(data, 32, 16) key, iv, tag, payload, = _encrypt(data, 32)
payload += tag payload += tag
return EncryptionResult(payload=payload, key=key, iv=iv) return EncryptionResult(payload=payload, key=key, iv=iv)
@@ -91,4 +92,4 @@ def get_new_key():
def get_new_iv(): def get_new_iv():
return os.urandom(16) return os.urandom(IV_SIZE)