Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-28 09:14:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Extract readKeyFromLine.

Browse source
This commit is contained in:
Louis-Bertrand Varin 2017-01-14 13:25:30 -05:00
parent 1ca5b72073
commit 798041fe11
6 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/keys/CompositeKey.cpp
View file

@ -18,12 +18,15 @@
#include "CompositeKey.h"
#include "CompositeKey_p.h"
#include <QtConcurrent>
#include <QElapsedTimer>
#include <QFile>
#include <QtConcurrent>
#include "core/Global.h"
#include "crypto/CryptoHash.h"
#include "crypto/SymmetricCipher.h"
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
CompositeKey::CompositeKey()
{
@ -71,6 +74,29 @@ CompositeKey& CompositeKey::operator=(const CompositeKey& key)
return *this;
}
/*
* Read a key from a line of input.
* If the line references a valid file
* path, the key is loaded from file.
*/
CompositeKey CompositeKey::readFromLine(QString line)
{
CompositeKey key;
if (QFile::exists(line)) {
FileKey fileKey;
fileKey.load(line);
key.addKey(fileKey);
}
else {
PasswordKey password;
password.setPassword(line);
key.addKey(password);
}
return key;
}
QByteArray CompositeKey::rawKey() const
{
CryptoHash cryptoHash(CryptoHash::Sha256);

2
src/keys/CompositeKey.h
View file

@ -19,6 +19,7 @@
#define KEEPASSX_COMPOSITEKEY_H
#include <QList>
#include <QString>
#include "keys/Key.h"
@ -39,6 +40,7 @@ public:
void addKey(const Key& key);
static int transformKeyBenchmark(int msec);
static CompositeKey readFromLine(QString line);
private:
static QByteArray transformKeyRaw(const QByteArray& key, const QByteArray& seed,