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

Minor improvements in CompositeKey and TestKeys.

Browse Source
This commit is contained in:
Felix Geyer
2012-04-25 18:35:30 +02:00
parent f82de78861
commit 0ad4b3d8fe
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/keys/CompositeKey.cpp
View File

@@ -33,7 +33,7 @@ CompositeKey::CompositeKey(const CompositeKey& key)
CompositeKey::~CompositeKey()
{
qDeleteAll(m_keys);
clear();
}
void CompositeKey::clear()
@@ -51,8 +51,8 @@ CompositeKey& CompositeKey::operator=(const CompositeKey& key)
{
clear();
Q_FOREACH (Key* subKey, key.m_keys) {
m_keys.append(subKey->clone());
Q_FOREACH (const Key* subKey, key.m_keys) {
addKey(*subKey);
}
return *this;
@@ -62,7 +62,7 @@ QByteArray CompositeKey::rawKey() const
{
CryptoHash cryptoHash(CryptoHash::Sha256);
Q_FOREACH (Key* key, m_keys) {
Q_FOREACH (const Key* key, m_keys) {
cryptoHash.addData(key->rawKey());
}
@@ -86,9 +86,11 @@ QByteArray CompositeKey::transform(const QByteArray& seed, int rounds) const
return CryptoHash::hash(transformed, CryptoHash::Sha256);
}
QByteArray CompositeKey::transformKeyRaw(const QByteArray& key, const QByteArray& seed, int rounds) {
QByteArray CompositeKey::transformKeyRaw(const QByteArray& key, const QByteArray& seed,
int rounds) {
QByteArray iv(16, 0);
SymmetricCipher cipher(SymmetricCipher::Aes256, SymmetricCipher::Ecb, SymmetricCipher::Encrypt, seed, iv);
SymmetricCipher cipher(SymmetricCipher::Aes256, SymmetricCipher::Ecb,
SymmetricCipher::Encrypt, seed, iv);
QByteArray result = key;