Read support for 12-byte IVs in addition to 16-byte IVs

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java b/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java
index 64188c5db..4ec164344 100644
--- a/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java
+++ b/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java
@@ -4,10 +4,16 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.util.regex.Pattern;
 
 
 public class AesGcmURLStreamHandler extends URLStreamHandler {
 
+    /**
+     * This matches a 48 or 44 byte IV + KEY hex combo, like used in http/aesgcm upload anchors
+     */
+    public static final Pattern IV_KEY = Pattern.compile("([A-Fa-f0-9]{2}){48}|([A-Fa-f0-9]{2}){44}");
+
     public static final String PROTOCOL_NAME = "aesgcm";
 
     @Override