arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge b0dfbfdbcf into b083390d4f

pull/186/merge
Berendea Nicolae 2017-05-16 07:10:57 +00:00 committed by GitHub
parent b083390d4f b0dfbfdbcf
commit 97bf82261a
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
modes.cpp
View File

@ -195,21 +195,34 @@ void CBC_CTS_Encryption::ProcessLastBlock(byte *outString, const byte *inString,
// steal from IV
memcpy(outString, m_register, length);
outString = m_stolenIV;
// output last full ciphertext block
xorbuf(m_register, inString, length);
m_cipher->ProcessBlock(m_register);
memcpy(outString, m_register, BlockSize());
}
else
{
// steal from next to last block
xorbuf(m_register, inString, BlockSize());
m_cipher->ProcessBlock(m_register);
inString += BlockSize();
length -= BlockSize();
memcpy(outString+BlockSize(), m_register, length);
}
// output last full ciphertext block
xorbuf(m_register, inString, length);
m_cipher->ProcessBlock(m_register);
memcpy(outString, m_register, BlockSize());
// output last full ciphertext block
if (inString == outString)
{
memcpy(m_buffer, outString+BlockSize(), length);
memcpy(outString+BlockSize(), m_register, length);
xorbuf(m_register, m_buffer, length);
}
else
{
memcpy(outString+BlockSize(), m_register, length);
xorbuf(m_register, inString+BlockSize(), length);
}
m_cipher->ProcessBlock(m_register);
memcpy(outString, m_register, BlockSize());
}
}
void CBC_Decryption::ResizeBuffers()
@ -241,26 +254,35 @@ void CBC_CTS_Decryption::ProcessLastBlock(byte *outString, const byte *inString,
{
pn = inString;
pn1 = m_register;
}
else
{
pn = inString + BlockSize();
pn1 = inString;
length -= BlockSize();
}
// decrypt last partial plaintext block
memcpy(m_temp, pn1, BlockSize());
m_cipher->ProcessBlock(m_temp);
xorbuf(m_temp, pn, length);
// decrypt last partial plaintext block
memcpy(m_temp, pn1, BlockSize());
m_cipher->ProcessBlock(m_temp);
xorbuf(m_temp, pn, length);
if (stealIV)
memcpy(outString, m_temp, length);
}
else
{
memcpy(outString+BlockSize(), m_temp, length);
length -= BlockSize();
// decrypt last partial plaintext block
memcpy(m_temp, inString, BlockSize());
m_cipher->ProcessBlock(m_temp);
xorbuf(m_temp, inString+BlockSize(), length);
// decrypt next to last plaintext block
memcpy(m_temp, pn, length);
if (inString == outString)
{
memcpy(m_buffer, outString+BlockSize(), length);
memcpy(outString+BlockSize(), m_temp, length);
memcpy(m_temp, m_buffer, length);
}
else
{
memcpy(outString+BlockSize(), m_temp, length);
memcpy(m_temp, inString+BlockSize(), length);
}
m_cipher->ProcessBlock(m_temp);
xorbuf(outString, m_temp, m_register, BlockSize());
}