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

SymmetricCipher: Add keySize(), don't rely on state for sizes

Browse source 
This additionally makes keySize() and blockSize() work before
setting the key and IV. Required for SSH agent decryption.
This commit is contained in:
Toni Spets 2017-10-29 17:07:56 +02:00
parent a81a5fa31b
commit 248ae9d4ba
5 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/crypto/SymmetricCipherGcrypt.cpp
View file

@ -26,7 +26,6 @@ SymmetricCipherGcrypt::SymmetricCipherGcrypt(SymmetricCipher::Algorithm algo, Sy
, m_algo(gcryptAlgo(algo))
, m_mode(gcryptMode(mode))
, m_direction(direction)
, m_blockSize(-1)
{
}
@ -95,14 +94,6 @@ bool SymmetricCipherGcrypt::init()
return false;
}
size_t blockSizeT;
error = gcry_cipher_algo_info(m_algo, GCRYCTL_GET_BLKLEN, nullptr, &blockSizeT);
if (error != 0) {
setErrorString(error);
return false;
}
m_blockSize = blockSizeT;
return true;
}
@ -237,9 +228,28 @@ bool SymmetricCipherGcrypt::reset()
return true;
}
int SymmetricCipherGcrypt::keySize() const
{
gcry_error_t error;
size_t keySizeT;
error = gcry_cipher_algo_info(m_algo, GCRYCTL_GET_KEYLEN, nullptr, &keySizeT);
if (error != 0)
return -1;
return keySizeT;
}
int SymmetricCipherGcrypt::blockSize() const
{
return m_blockSize;
gcry_error_t error;
size_t blockSizeT;
error = gcry_cipher_algo_info(m_algo, GCRYCTL_GET_BLKLEN, nullptr, &blockSizeT);
if (error != 0)
return -1;
return blockSizeT;
}
QString SymmetricCipherGcrypt::errorString() const