diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-08-13 23:11:47 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-08-13 23:11:47 +0200 |
| commit | 24c47c0bbb56f7e0d14b9555cb99b8e683cc2652 (patch) | |
| tree | b4f679d85e2dbeb78bda960ad4536290603f3cc4 /src/main/java/de/pixart/messenger/entities/Message.java | |
| parent | d31dd9cbe497f23e44ef92d09c5b13446f4c856f (diff) | |
Read support for 12-byte IVs in addition to 16-byte IVs
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 317605167..06bfcf4b6 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -675,7 +675,7 @@ public class Message extends AbstractEntity { final URL url = new URL(body); final String ref = url.getRef(); final String protocol = url.getProtocol(); - final boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}"); + final boolean encrypted = ref != null && AesGcmURLStreamHandler.IV_KEY.matcher(ref).matches(); treatAsDownloadable = (AesGcmURLStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted) || (("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol)) && (oob || encrypted)); } catch (MalformedURLException e) { |