rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix getMasterKey for V3

Browse Source
This commit is contained in:
J-Jamet
2018-03-10 13:15:42 +01:00
parent 19ebc40bdb
commit 30c5db92e6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
View File

@@ -221,18 +221,16 @@ public class PwDatabaseV3 extends PwDatabase {
public byte[] getMasterKey(String key, InputStream keyInputStream) public byte[] getMasterKey(String key, InputStream keyInputStream)
throws InvalidKeyFileException, IOException { throws InvalidKeyFileException, IOException {
assert (key != null);
if (key.length() > 0 && keyInputStream != null) { if (key != null && key.length() > 0 && keyInputStream != null) {
return getCompositeKey(key, keyInputStream); return getCompositeKey(key, keyInputStream);
} else if (key.length() > 0) { } else if (key != null && key.length() > 0) {
return getPasswordKey(key); return getPasswordKey(key);
} else if (keyInputStream != null) { } else if (keyInputStream != null) {
return getFileKey(keyInputStream); return getFileKey(keyInputStream);
} else { } else {
throw new IllegalArgumentException("Key cannot be empty."); throw new IllegalArgumentException("Key cannot be empty.");
} }
} }
@Override @Override