Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-25 07:45:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Write the remaining buffer in reset().

Browse source
This commit is contained in:
Felix Geyer 2010-09-18 17:13:28 +02:00
parent c2bdfab158
commit 36d974649e
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/streams/SymmetricCipherStream.cpp
View file

@ -29,11 +29,18 @@ SymmetricCipherStream::SymmetricCipherStream(QIODevice* baseDevice, SymmetricCip
bool SymmetricCipherStream::reset()
{
if (isWritable()) {
if (!writeBlock()) {
return false;
}
}
m_buffer.clear();
m_bufferPos = 0;
m_bufferFilling = false;
m_error = false;
m_cipher->reset();
return true;
}
@ -133,6 +140,7 @@ bool SymmetricCipherStream::writeBlock()
return true;
}
else if (m_buffer.size() != m_cipher->blockSize()) {
// PKCS7 padding
int padLen = m_cipher->blockSize() - m_buffer.size();
for (int i=m_buffer.size(); i<m_cipher->blockSize(); i++) {
m_buffer.append(static_cast<char>(padLen));