Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-22 08:11:25 -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

29
utils/kdbx-merge.cpp
View file

@ -29,31 +29,6 @@
#include "format/KeePass2Reader.h"
#include "format/KeePass2Writer.h"
#include "keys/CompositeKey.h"
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
/*
* Read a key from a line of input.
* If the line references a valid file
* path, the key is loaded from file.
*/
CompositeKey readKeyFromLine(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;
}
int main(int argc, char **argv)
{
@ -85,7 +60,7 @@ int main(int argc, char **argv)
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QString line1 = inputTextStream.readLine();
CompositeKey key1 = readKeyFromLine(line1);
CompositeKey key1 = CompositeKey::readFromLine(line1);
CompositeKey key2;
if (parser.isSet("same-password")) {
@ -93,7 +68,7 @@ int main(int argc, char **argv)
}
else {
QString line2 = inputTextStream.readLine();
key2 = readKeyFromLine(line2);
key2 = CompositeKey::readFromLine(line2);
}