Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-10-17 16:01:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Set master key after reading the database.

Browse source
This commit is contained in:
Felix Geyer 2012-05-10 22:46:36 +02:00
parent 9d8e276950
commit 366d8a0f0e
5 changed files with 68 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/format/KeePass1Reader.cpp
View file

@ -30,6 +30,8 @@
#include "crypto/CryptoHash.h"
#include "format/KeePass1.h"
#include "keys/CompositeKey.h"
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
#include "streams/SymmetricCipherStream.h"
class KeePass1Key : public CompositeKey
@ -52,8 +54,26 @@ KeePass1Reader::KeePass1Reader()
}
Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& password,
const QByteArray& keyfileData)
QIODevice* keyfileDevice)
{
QByteArray keyfileData;
FileKey newFileKey;
if (keyfileDevice) {
keyfileData = readKeyfile(keyfileDevice);
if (keyfileData.isEmpty()) {
return 0;
}
if (!keyfileDevice->seek(0)) {
return 0;
}
if (!newFileKey.load(keyfileDevice)) {
return 0;
}
}
QScopedPointer<Database> db(new Database());
QScopedPointer<Group> tmpParent(new Group());
m_db = db.data();
@ -197,22 +217,41 @@ Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& passwor
entry->setUpdateTimeinfo(true);
}
CompositeKey key;
if (!password.isEmpty()) {
key.addKey(PasswordKey(password));
}
if (keyfileDevice) {
key.addKey(newFileKey);
}
db->setKey(key);
return db.take();
}
Database* KeePass1Reader::readDatabase(const QString& filename, const QString& password,
const QByteArray& keyfileData)
const QString& keyfileName)
{
QFile file(filename);
if (!file.open(QFile::ReadOnly)) {
raiseError(file.errorString());
QFile dbFile(filename);
if (!dbFile.open(QFile::ReadOnly)) {
raiseError(dbFile.errorString());
return 0;
}
QScopedPointer<Database> db(readDatabase(&file, password, keyfileData));
QScopedPointer<QFile> keyFile;
if (!keyfileName.isEmpty()) {
keyFile.reset(new QFile(keyfileName));
if (!keyFile->open(QFile::ReadOnly)) {
raiseError(keyFile->errorString());
return 0;
}
}
if (file.error() != QFile::NoError) {
raiseError(file.errorString());
QScopedPointer<Database> db(readDatabase(&dbFile, password, keyFile.data()));
if (dbFile.error() != QFile::NoError) {
raiseError(dbFile.errorString());
return 0;
}