Fix challenge-response key data after Botan

* Fix #6420
* Refactor Challenge-Response key files to be more streamlined. Added a test to confirm raw key data is accurate.
This commit is contained in:
Jonathan White
2021-04-22 23:07:49 -04:00
parent 60adcacaaa
commit fd0bdaae80
14 changed files with 65 additions and 108 deletions

View File

@@ -18,22 +18,18 @@
#include "MockChallengeResponseKey.h"
MockChallengeResponseKey::MockChallengeResponseKey(const QByteArray& secret)
: ChallengeResponseKey(QUuid("aac5b480-cdc0-411e-9cb8-962062dcc1fd"))
: ChallengeResponseKey()
, m_secret(secret)
{
}
MockChallengeResponseKey::~MockChallengeResponseKey()
QByteArray MockChallengeResponseKey::rawKey() const
{
return m_challenge + m_secret;
}
bool MockChallengeResponseKey::challenge(const QByteArray& challenge)
{
m_challenge = challenge;
auto response = m_challenge + m_secret;
m_key.resize(response.size());
std::copy(response.begin(), response.end(), m_key.data());
return true;
}

View File

@@ -28,13 +28,17 @@ class MockChallengeResponseKey : public ChallengeResponseKey
{
public:
explicit MockChallengeResponseKey(const QByteArray& secret);
Q_DISABLE_COPY(MockChallengeResponseKey);
~MockChallengeResponseKey() override;
~MockChallengeResponseKey() override = default;
QByteArray rawKey() const override;
bool challenge(const QByteArray& challenge) override;
private:
QByteArray m_challenge;
QByteArray m_secret;
Q_DISABLE_COPY(MockChallengeResponseKey);
};
#endif // KEEPASSXC_MOCKCHALLENGERESPONSEKEY_H