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

Move key transform() call into Database.

Browse source
This commit is contained in:
Felix Geyer 2011-06-29 16:39:39 +02:00
parent fd9685037b
commit 6afda908bc
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core/Database.cpp
View file

@ -21,6 +21,7 @@
#include <QtCore/QXmlStreamReader> #include <QtCore/QXmlStreamReader>
#include "Metadata.h" #include "Metadata.h"
#include "crypto/Random.h"
Database::Database() Database::Database()
{ {
@ -142,21 +143,18 @@ void Database::setCompressionAlgo(Database::CompressionAlgorithm algo)
m_compressionAlgo = algo; m_compressionAlgo = algo;
} }
void Database::setTransformSeed(const QByteArray& seed)
{
Q_ASSERT(seed.size() == 32);
m_transformSeed = seed;
}
void Database::setTransformRounds(quint64 rounds) void Database::setTransformRounds(quint64 rounds)
{ {
m_transformRounds = rounds; m_transformRounds = rounds;
} }
void Database::setTransformedMasterKey(QByteArray& key) void Database::setKey(const CompositeKey& key, const QByteArray& transformSeed)
{ {
Q_ASSERT(key.size() == 32); m_transformSeed = transformSeed;
m_transformedMasterKey = key.transform(transformSeed, transformRounds());
m_transformedMasterKey = key; }
void Database::setKey(const CompositeKey& key)
{
setKey(key, Random::randomArray(32));
} }

6
src/core/Database.h
View file

@ -23,6 +23,8 @@
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtGui/QIcon> #include <QtGui/QIcon>
#include "keys/CompositeKey.h"
class Metadata; class Metadata;
struct DeletedObject struct DeletedObject
@ -62,9 +64,9 @@ public:
void setCipher(const Uuid& cipher); void setCipher(const Uuid& cipher);
void setCompressionAlgo(Database::CompressionAlgorithm algo); void setCompressionAlgo(Database::CompressionAlgorithm algo);
void setTransformSeed(const QByteArray& seed);
void setTransformRounds(quint64 rounds); void setTransformRounds(quint64 rounds);
void setTransformedMasterKey(QByteArray& key); void setKey(const CompositeKey& key, const QByteArray& transformSeed);
void setKey(const CompositeKey& key);
Q_SIGNALS: Q_SIGNALS:
void groupDataChanged(Group* group); void groupDataChanged(Group* group);

7
src/format/KeePass2Reader.cpp
View file

@ -64,12 +64,11 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
// TODO check if all header fields have been parsed // TODO check if all header fields have been parsed
QByteArray transformedMasterKey = key.transform(m_db->transformSeed(), m_db->transformRounds()); m_db->setKey(key, m_transformSeed);
m_db->setTransformedMasterKey(transformedMasterKey);
CryptoHash hash(CryptoHash::Sha256); CryptoHash hash(CryptoHash::Sha256);
hash.addData(m_masterSeed); hash.addData(m_masterSeed);
hash.addData(transformedMasterKey); hash.addData(m_db->transformedMasterKey());
QByteArray finalKey = hash.result(); QByteArray finalKey = hash.result();
SymmetricCipherStream cipherStream(device, SymmetricCipher::Aes256, SymmetricCipher::Cbc, SymmetricCipher::Decrypt, finalKey, m_encryptionIV); SymmetricCipherStream cipherStream(device, SymmetricCipher::Aes256, SymmetricCipher::Cbc, SymmetricCipher::Decrypt, finalKey, m_encryptionIV);
@ -261,7 +260,7 @@ void KeePass2Reader::setTransformSeed(const QByteArray& data)
raiseError(""); raiseError("");
} }
else { else {
m_db->setTransformSeed(data); m_transformSeed = data;
} }
} }

1
src/format/KeePass2Reader.h
View file

@ -58,6 +58,7 @@ private:
Database* m_db; Database* m_db;
QByteArray m_masterSeed; QByteArray m_masterSeed;
QByteArray m_transformSeed;
QByteArray m_encryptionIV; QByteArray m_encryptionIV;
QByteArray m_streamStartBytes; QByteArray m_streamStartBytes;
QByteArray m_protectedStreamKey; QByteArray m_protectedStreamKey;