From 24c47c0bbb56f7e0d14b9555cb99b8e683cc2652 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 13 Aug 2017 23:11:47 +0200 Subject: Read support for 12-byte IVs in addition to 16-byte IVs --- src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java') diff --git a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java index 7326cbf4b..9f49ac218 100644 --- a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java +++ b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java @@ -98,7 +98,7 @@ public class HttpDownloadConnection implements Transferable { message.setRelativeFilePath(filename + "." + extension); this.file = mXmppConnectionService.getFileBackend().getFile(message, false); final String reference = mUrl.getRef(); - if (reference != null && reference.matches("([A-Fa-f0-9]{2}){48}")) { + if (reference != null && AesGcmURLStreamHandler.IV_KEY.matcher(reference).matches()) { this.file.setKeyAndIv(CryptoHelper.hexToBytes(reference)); } @@ -383,7 +383,7 @@ public class HttpDownloadConnection implements Transferable { message.setType(Message.TYPE_FILE); final URL url; final String ref = mUrl.getRef(); - if (ref != null && ref.matches("([A-Fa-f0-9]{2}){48}")) { + if (ref != null && AesGcmURLStreamHandler.IV_KEY.matcher(ref).matches()) { url = CryptoHelper.toAesGcmUrl(mUrl); } else { url = mUrl; -- cgit v1.2.3