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/cmac.cpp b/cmac.cpp
index 95d37ddd..ce8563cf 100644
--- a/cmac.cpp
+++ b/cmac.cpp
@@ -57,7 +57,7 @@ void CMAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const Name
 

 void CMAC_Base::Update(const byte *input, size_t length)

 {

-	assert((input && length) || !(input || length));

+	CRYPTOPP_ASSERT((input && length) || !(input || length));

 	if (!length)

 		return;

 

@@ -84,7 +84,7 @@ void CMAC_Base::Update(const byte *input, size_t length)
 

 	if (length > blockSize)

 	{

-		assert(m_counter == 0);

+		CRYPTOPP_ASSERT(m_counter == 0);

 		size_t leftOver = 1 + cipher.AdvancedProcessBlocks(m_reg, input, m_reg, length-1, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput);

 		input += (length - leftOver);

 		length = leftOver;

@@ -92,12 +92,12 @@ void CMAC_Base::Update(const byte *input, size_t length)
 

 	if (length > 0)

 	{

-		assert(m_counter + length <= blockSize);

+		CRYPTOPP_ASSERT(m_counter + length <= blockSize);

 		xorbuf(m_reg+m_counter, input, length);

 		m_counter += (unsigned int)length;

 	}

 

-	assert(m_counter > 0);

+	CRYPTOPP_ASSERT(m_counter > 0);

 }

 

 void CMAC_Base::TruncatedFinal(byte *mac, size_t size)