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

Use QSharedPointer instead of cloning YkChallengeResponseKey and make it a QObject to allow emitting signals

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-23 23:52:36 +01:00
parent e93e4a9931
commit 093fe5c7ef
9 changed files with 78 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/keys/CompositeKey.cpp
View File

@@ -46,7 +46,6 @@ CompositeKey::~CompositeKey()
void CompositeKey::clear()
{
qDeleteAll(m_keys);
qDeleteAll(m_challengeResponseKeys);
m_keys.clear();
m_challengeResponseKeys.clear();
}
@@ -73,8 +72,8 @@ CompositeKey& CompositeKey::operator=(const CompositeKey& key)
for (const Key* subKey : asConst(key.m_keys)) {
addKey(*subKey);
}
for (const ChallengeResponseKey* subKey : asConst(key.m_challengeResponseKeys)) {
addChallengeResponseKey(*subKey);
for (const auto subKey : asConst(key.m_challengeResponseKeys)) {
addChallengeResponseKey(subKey);
}
return *this;
@@ -176,9 +175,8 @@ QByteArray CompositeKey::transformKeyRaw(const QByteArray& key, const QByteArray
bool CompositeKey::challenge(const QByteArray& seed, QByteArray& result) const
{
/* If no challenge response was requested, return nothing to
* maintain backwards compatability with regular databases.
*/
// if no challenge response was requested, return nothing to
// maintain backwards compatibility with regular databases.
if (m_challengeResponseKeys.length() == 0) {
result.clear();
return true;
@@ -186,9 +184,9 @@ bool CompositeKey::challenge(const QByteArray& seed, QByteArray& result) const
CryptoHash cryptoHash(CryptoHash::Sha256);
for (ChallengeResponseKey* key : m_challengeResponseKeys) {
/* If the device isn't present or fails, return an error */
if (key->challenge(seed) == false) {
for (const auto key : m_challengeResponseKeys) {
// if the device isn't present or fails, return an error
if (!key->challenge(seed)) {
return false;
}
cryptoHash.addData(key->rawKey());
@@ -203,11 +201,12 @@ void CompositeKey::addKey(const Key& key)
m_keys.append(key.clone());
}
void CompositeKey::addChallengeResponseKey(const ChallengeResponseKey& key)
void CompositeKey::addChallengeResponseKey(QSharedPointer<ChallengeResponseKey> key)
{
m_challengeResponseKeys.append(key.clone());
m_challengeResponseKeys.append(key);
}
int CompositeKey::transformKeyBenchmark(int msec)
{
TransformKeyBenchmarkThread thread1(msec);