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

Deep copy subkeys when cloning CompositeKey.

Browse source
This commit is contained in:
Felix Geyer 2011-11-13 14:52:43 +01:00
parent ac60f7ce70
commit 0014d50b59
5 changed files with 110 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/keys/CompositeKey.cpp
View file

@ -22,6 +22,15 @@
#include <QtCore/QtConcurrentRun>
CompositeKey::CompositeKey()
{
}
CompositeKey::CompositeKey(const CompositeKey& key)
{
*this = key;
}
CompositeKey::~CompositeKey()
{
qDeleteAll(m_keys);
@ -32,6 +41,14 @@ CompositeKey* CompositeKey::clone() const
return new CompositeKey(*this);
}
CompositeKey& CompositeKey::operator=(const CompositeKey& key)
{
Q_FOREACH (Key* subKey, key.m_keys) {
m_keys.append(subKey->clone());
}
return *this;
}
QByteArray CompositeKey::rawKey() const
{
@ -46,6 +63,9 @@ QByteArray CompositeKey::rawKey() const
QByteArray CompositeKey::transform(const QByteArray& seed, int rounds) const
{
Q_ASSERT(seed.size() == 32);
Q_ASSERT(rounds > 0);
QByteArray key = rawKey();
QFuture<QByteArray> future1 = QtConcurrent::run(transformKeyRaw, key.left(16), seed, rounds);

3
src/keys/CompositeKey.h
View file

@ -25,8 +25,11 @@
class CompositeKey : public Key
{
public:
CompositeKey();
CompositeKey(const CompositeKey& key);
~CompositeKey();
CompositeKey* clone() const;
CompositeKey& operator=(const CompositeKey& key);
QByteArray rawKey() const;
QByteArray transform(const QByteArray& seed, int rounds) const;