Add CRYPTOPP_ASSERT (Issue 277, CVE-2016-7420)

trap.h and CRYPTOPP_ASSERT has existed for over a year in Master. We deferred on the cut-over waiting for a minor version bump (5.7). We have to use it now due to CVE-2016-7420

1 files changed, 4 insertions, 4 deletions

diff --git a/strciphr.cpp b/strciphr.cpp
index b8cd2530..a0197c94 100644
--- a/strciphr.cpp
+++ b/strciphr.cpp
@@ -39,7 +39,7 @@ void AdditiveCipherTemplate<S>::GenerateBlock(byte *outString, size_t length)
 		if (!length)

 			return;

 	}

-	assert(m_leftOver == 0);

+	CRYPTOPP_ASSERT(m_leftOver == 0);

 

 	PolicyInterface &policy = this->AccessPolicy();

 	unsigned int bytesPerIteration = policy.GetBytesPerIteration();

@@ -78,7 +78,7 @@ void AdditiveCipherTemplate<S>::ProcessData(byte *outString, const byte *inStrin
 		if (!length)

 			return;

 	}

-	assert(m_leftOver == 0);

+	CRYPTOPP_ASSERT(m_leftOver == 0);

 

 	PolicyInterface &policy = this->AccessPolicy();

 	unsigned int bytesPerIteration = policy.GetBytesPerIteration();

@@ -176,7 +176,7 @@ void CFB_CipherTemplate<BASE>::Resynchronize(const byte *iv, int length)
 template <class BASE>

 void CFB_CipherTemplate<BASE>::ProcessData(byte *outString, const byte *inString, size_t length)

 {

-	assert(length % this->MandatoryBlockSize() == 0);

+	CRYPTOPP_ASSERT(length % this->MandatoryBlockSize() == 0);

 

 	PolicyInterface &policy = this->AccessPolicy();

 	unsigned int bytesPerIteration = policy.GetBytesPerIteration();

@@ -196,7 +196,7 @@ void CFB_CipherTemplate<BASE>::ProcessData(byte *outString, const byte *inString
 	if (!length)

 		return;

 

-	assert(m_leftOver == 0);

+	CRYPTOPP_ASSERT(m_leftOver == 0);

 

 	if (policy.CanIterate() && length >= bytesPerIteration && IsAlignedOn(outString, alignment))

 	{