diff options
author | Marvin W <git@larma.de> | 2019-09-10 20:56:00 +0200 |
---|---|---|
committer | Marvin W <git@larma.de> | 2019-09-16 23:31:11 +0200 |
commit | e899668213ee8f7d3566bb5754b488d8633c30c7 (patch) | |
tree | 30119a9068abed58ad692de8fcf5723c6e441de8 /plugins/omemo/src/file_transfer/file_decryptor.vala | |
parent | 87d64524c8e4397515be045901427e71b660134f (diff) | |
download | dino-e899668213ee8f7d3566bb5754b488d8633c30c7.tar.gz dino-e899668213ee8f7d3566bb5754b488d8633c30c7.zip |
Add JET support
Diffstat (limited to 'plugins/omemo/src/file_transfer/file_decryptor.vala')
-rw-r--r-- | plugins/omemo/src/file_transfer/file_decryptor.vala | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/plugins/omemo/src/file_transfer/file_decryptor.vala b/plugins/omemo/src/file_transfer/file_decryptor.vala index bc6f8592..d60ecdc8 100644 --- a/plugins/omemo/src/file_transfer/file_decryptor.vala +++ b/plugins/omemo/src/file_transfer/file_decryptor.vala @@ -1,5 +1,6 @@ using Dino.Entities; +using Crypto; using Signal; namespace Dino.Plugins.Omemo { @@ -56,20 +57,17 @@ public class OmemoFileDecryptor : FileDecryptor, Object { key = iv_and_key[16:48]; } - // Read data - uint8[] buf = new uint8[256]; - Array<uint8> data = new Array<uint8>(false, true, 0); - size_t len = -1; - do { - len = yield encrypted_stream.read_async(buf); - data.append_vals(buf, (uint) len); - } while(len > 0); - - // Decrypt - uint8[] cleartext = Signal.aes_decrypt(Cipher.AES_GCM_NOPADDING, key, iv, data.data); file_transfer.encryption = Encryption.OMEMO; - return new MemoryInputStream.from_data(cleartext); - } catch (Error e) { + debug("Decrypting file %s from %s", file_transfer.file_name, file_transfer.server_file_name); + + SymmetricCipher cipher = new SymmetricCipher("AES-GCM"); + cipher.set_key(key); + cipher.set_iv(iv); + return new ConverterInputStream(encrypted_stream, new SymmetricCipherDecrypter((owned) cipher)); + + } catch (Crypto.Error e) { + throw new FileReceiveError.DECRYPTION_FAILED("OMEMO file decryption error: %s".printf(e.message)); + } catch (GLib.Error e) { throw new FileReceiveError.DECRYPTION_FAILED("OMEMO file decryption error: %s".printf(e.message)); } } |