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 binary keyfiles.

Browse Source
This commit is contained in:
Brian Pellin
2016-03-15 20:07:24 -05:00
parent c78a3b875b
commit 70bd25d41c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/keepassdroid/database/PwDatabase.java
View File

@@ -20,6 +20,7 @@
package com.keepassdroid.database;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -136,16 +137,16 @@ public abstract class PwDatabase {
throws InvalidKeyFileException, IOException {
assert(keyInputStream != null);
byte[] key = loadXmlKeyFile(keyInputStream);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Util.copyStream(keyInputStream, bos);
byte[] keyData = bos.toByteArray();
ByteArrayInputStream bis = new ByteArrayInputStream(keyData);
byte[] key = loadXmlKeyFile(bis);
if ( key != null ) {
return key;
}
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Util.copyStream(keyInputStream, bos);
byte[] keyData = bos.toByteArray();
long fileSize = keyData.length;
if ( fileSize == 0 ) {
throw new KeyFileEmptyException();