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, 2 insertions, 2 deletions

diff --git a/iterhash.cpp b/iterhash.cpp
index e324c442..a757a3e6 100644
--- a/iterhash.cpp
+++ b/iterhash.cpp
@@ -23,7 +23,7 @@ template <class T, class BASE> void IteratedHashBase<T, BASE>::Update(const byte
 

 	T* dataBuf = this->DataBuf();

 	byte* data = (byte *)dataBuf;

-	assert(dataBuf && data);

+	CRYPTOPP_ASSERT(dataBuf && data);

 

 	if (num != 0)	// process left over data

 	{

@@ -48,7 +48,7 @@ template <class T, class BASE> void IteratedHashBase<T, BASE>::Update(const byte
 	{

 		if (input == data)

 		{

-			assert(len == blockSize);

+			CRYPTOPP_ASSERT(len == blockSize);

 			HashBlock(dataBuf);

 			return;

 		}