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

Make AuthenticatedSymmetricCipherBase::ProcessData overflow safe

pull/795/head
Jeffrey Walton 2019-01-30 10:45:12 -05:00
parent 97838012ee
commit df98f8c16b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
authenc.cpp
View File

@ -79,6 +79,7 @@ void AuthenticatedSymmetricCipherBase::Resynchronize(const byte *iv, int length)
void AuthenticatedSymmetricCipherBase::Update(const byte *input, size_t length) void AuthenticatedSymmetricCipherBase::Update(const byte *input, size_t length)
{ {
// Part of original authenc.cpp code. Don't remove it.
if (length == 0) {return;} if (length == 0) {return;}
switch (m_state) switch (m_state)
@ -107,9 +108,9 @@ void AuthenticatedSymmetricCipherBase::Update(const byte *input, size_t length)
void AuthenticatedSymmetricCipherBase::ProcessData(byte *outString, const byte *inString, size_t length) void AuthenticatedSymmetricCipherBase::ProcessData(byte *outString, const byte *inString, size_t length)
{ {
m_totalMessageLength += length; if (m_state >= State_IVSet && length > MaxMessageLength()-m_totalMessageLength)
if (m_state >= State_IVSet && m_totalMessageLength > MaxMessageLength())
throw InvalidArgument(AlgorithmName() + ": message length exceeds maximum"); throw InvalidArgument(AlgorithmName() + ": message length exceeds maximum");
m_totalMessageLength += length;
reswitch: reswitch:
switch (m_state) switch (m_state)