jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate KeePass2RandomStream into KeePass2 reader and writer classes.

Browse Source 
This hopefully completes support for reading/writing kdbx <= 2.14 files.

Also fix a bug in KeePass2XmlWriter so it sets Protected="True" in the Value
tag instead of Key.
This commit is contained in:
Felix Geyer
2011-07-07 00:15:52 +02:00
parent 58e048be96
commit a299dd9715
12 changed files with 200 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/format/KeePass2XmlReader.cpp
View File

@@ -22,21 +22,22 @@
#include "core/Database.h"
#include "core/DatabaseIcons.h"
#include "core/Metadata.h"
#include "format/KeePass2RandomStream.h"
KeePass2XmlReader::KeePass2XmlReader()
: m_cipher(0)
: m_randomStream(0)
, m_db(0)
, m_meta(0)
{
}
void KeePass2XmlReader::readDatabase(QIODevice* device, Database* db, SymmetricCipher* cipher)
void KeePass2XmlReader::readDatabase(QIODevice* device, Database* db, KeePass2RandomStream* randomStream)
{
m_xml.setDevice(device);
m_db = db;
m_meta = m_db->metadata();
m_cipher = cipher;
m_randomStream = randomStream;
m_tmpParent = new Group();
m_tmpParent->setParent(m_db);
@@ -524,8 +525,8 @@ void KeePass2XmlReader::parseEntryString(Entry *entry)
bool isProtected = attr.hasAttribute("Protected") && (attr.value("Protected") == "True");
if (isProtected && !value.isEmpty()) {
if (m_cipher) {
value = m_cipher->process(QByteArray::fromBase64(value.toAscii()));
if (m_randomStream) {
value = m_randomStream->process(QByteArray::fromBase64(value.toAscii()));
}
else {
raiseError();
@@ -556,7 +557,7 @@ void KeePass2XmlReader::parseEntryBinary(Entry *entry)
bool isProtected = attr.hasAttribute("Protected") && (attr.value("Protected") == "True");
if (isProtected && !value.isEmpty()) {
m_cipher->processInPlace(value);
m_randomStream->processInPlace(value);
}
entry->addAttachment(key, value, isProtected);