CRYPTOPP 5.6.3 RC6 checkin

1 files changed, 3 insertions, 4 deletions

diff --git a/cmac.cpp b/cmac.cpp
index 3e3a0631..e8fa6fea 100644
--- a/cmac.cpp
+++ b/cmac.cpp
@@ -5,7 +5,6 @@
 #ifndef CRYPTOPP_IMPORTS

 

 #include "cmac.h"

-#include "trap.h"

 

 NAMESPACE_BEGIN(CryptoPP)

 

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

 	if (length > blockSize)

 	{

-		CRYPTOPP_ASSERT(m_counter == 0);

+		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;

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

 	if (length > 0)

 	{

-		CRYPTOPP_ASSERT(m_counter + length <= blockSize);

+		assert(m_counter + length <= blockSize);

 		xorbuf(m_reg+m_counter, input, length);

 		m_counter += (unsigned int)length;

 	}

 

-	CRYPTOPP_ASSERT(m_counter > 0);

+	assert(m_counter > 0);

 }

 

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