diff options
| author | Marvin W <git@larma.de> | 2020-09-14 21:56:58 +0200 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2020-09-14 22:04:06 +0200 |
| commit | cd5b639a826ccafe5741a51f10cc8ca76ebfdd14 (patch) | |
| tree | f39146eb751f67e99942770c67cf06ca4a912243 /plugins/omemo/src/file_transfer/file_decryptor.vala | |
| parent | f6943a4c82ed39b8d6ae866855198596a51dade4 (diff) | |
| download | dino-cd5b639a826ccafe5741a51f10cc8ca76ebfdd14.tar.gz dino-cd5b639a826ccafe5741a51f10cc8ca76ebfdd14.zip | |
Send OMEMO-encrypted messages and files using 12 byte IV
Diffstat (limited to 'plugins/omemo/src/file_transfer/file_decryptor.vala')
| -rw-r--r-- | plugins/omemo/src/file_transfer/file_decryptor.vala | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins/omemo/src/file_transfer/file_decryptor.vala b/plugins/omemo/src/file_transfer/file_decryptor.vala index 7aec41d5..fedb9397 100644 --- a/plugins/omemo/src/file_transfer/file_decryptor.vala +++ b/plugins/omemo/src/file_transfer/file_decryptor.vala @@ -52,14 +52,8 @@ public class OmemoFileDecryptor : FileDecryptor, Object { MatchInfo match_info; this.url_regex.match(omemo_http_receive_data.original_url, 0, out match_info); uint8[] iv_and_key = hex_to_bin(match_info.fetch(2).up()); - uint8[] iv, key; - if (iv_and_key.length == 44) { - iv = iv_and_key[0:12]; - key = iv_and_key[12:44]; - } else { - iv = iv_and_key[0:16]; - key = iv_and_key[16:48]; - } + uint8[] iv = iv_and_key[0:iv_and_key.length-16]; + uint8[] key = iv_and_key[iv_and_key.length-16:iv_and_key.length]; file_transfer.encryption = Encryption.OMEMO; debug("Decrypting file %s from %s", file_transfer.file_name, file_transfer.server_file_name); |