Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-20 23:40:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.2.2' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-10-19 21:45:49 +02:00
commit 8592f7e672
17 changed files with 306 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/Database.cpp
View file

@ -260,6 +260,25 @@ bool Database::hasKey() const
return m_data.hasKey;
}
bool Database::transformKeyWithSeed(const QByteArray& transformSeed)
{
Q_ASSERT(hasKey());
bool ok;
QString errorString;
QByteArray transformedMasterKey =
m_data.key.transform(transformSeed, transformRounds(), &ok, &errorString);
if (!ok) {
return false;
}
m_data.transformSeed = transformSeed;
m_data.transformedMasterKey = transformedMasterKey;
return true;
}
bool Database::verifyKey(const CompositeKey& key) const
{
Q_ASSERT(hasKey());