Fix databases broken with missing AES KDF UUID

bpellin · Jun 12, 2021 · d9c6661 · d9c6661
1 parent a2dad15
commit d9c6661
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+ * Fix databases broken with missing AES KDF UUID
+
 KeePassDroid (2.5.17)
  * Fix KDBX3 -> 4 upgrade
 

diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfParameters.java b/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfParameters.java
@@ -50,7 +50,15 @@ public static KdfParameters deserialize(byte[] data) throws IOException {
             return null;
         }
 
-        UUID uuid = Types.bytestoUUID(d.getByteArray(ParamUUID));
+        byte[] uuidBytes = d.getByteArray((ParamUUID));
+        UUID uuid;
+        if (uuidBytes != null) {
+            uuid = Types.bytestoUUID(uuidBytes);
+        } else {
+            // Correct issue where prior versions were writing empty UUIDs for AES
+            uuid = AesKdf.CIPHER_UUID;
+        }
+
         if (uuid == null) {
             assert(false);
             return null;