use 12 byte IV for omemo and http upload

Daniel Gultsch created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java | 2 
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java         | 2 
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java

@@ -168,7 +168,7 @@ public class XmppAxolotlMessage {
 
 	private static byte[] generateIv() {
 		SecureRandom random = new SecureRandom();
-		byte[] iv = new byte[16];
+		byte[] iv = new byte[12];
 		random.nextBytes(iv);
 		return iv;
 	}

src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java

@@ -110,7 +110,7 @@ public class HttpUploadConnection implements Transferable {
 		if (Config.ENCRYPT_ON_HTTP_UPLOADED
 				|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL
 				|| message.getEncryption() == Message.ENCRYPTION_OTR) {
-			this.key = new byte[48]; // todo: change this to 44 for 12-byte IV instead of 16-byte at some point in future
+			this.key = new byte[44];
 			mXmppConnectionService.getRNG().nextBytes(this.key);
 			this.file.setKeyAndIv(this.key);
 		}