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 bad base64 decoder implementation #222 #140

Browse Source
This commit is contained in:
J-Jamet
2019-07-29 20:23:52 +02:00
parent bff9ec86ff
commit 7ae0d329e1
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt
View File

@@ -993,10 +993,15 @@ class ImporterV4(private val streamDir: File) : Importer<PwDatabaseV4>() {
}
@Throws(XmlPullParserException::class, IOException::class)
private fun readStringRaw(xpp: XmlPullParser): String {
private fun readBase64String(xpp: XmlPullParser): ByteArray {
//readNextNode = false;
return xpp.nextText()
Base64Coder.decode(xpp.nextText())?.let { buffer ->
val plainText = ByteArray(buffer.size)
randomStream?.processBytes(buffer, 0, buffer.size, plainText, 0)
return plainText
}
return ByteArray(0)
}
@Throws(XmlPullParserException::class, IOException::class)
@@ -1006,16 +1011,7 @@ class ImporterV4(private val streamDir: File) : Importer<PwDatabaseV4>() {
if (xpp.attributeCount > 0) {
val protect = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrProtected)
if (protect != null && protect.equals(PwDatabaseV4XML.ValTrue, ignoreCase = true)) {
// TODO stream for encrypted data
val encrypted = readStringRaw(xpp)
if (encrypted.isNotEmpty()) {
Base64Coder.decode(encrypted)?.let { buffer ->
val plainText = ByteArray(buffer.size)
randomStream?.processBytes(buffer, 0, buffer.size, plainText, 0)
return plainText
} ?: return ByteArray(0)
}
return readBase64String(xpp)
}
}