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/hmac.cpp b/hmac.cpp
index a25eb749..bb0d9e52 100644
--- a/hmac.cpp
+++ b/hmac.cpp
@@ -30,7 +30,7 @@ void HMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, con
 		keylength = hash.DigestSize();

 	}

 

-	assert(keylength <= blockSize);

+	CRYPTOPP_ASSERT(keylength <= blockSize);

 	memset(AccessIpad()+keylength, 0, blockSize-keylength);

 

 	for (unsigned int i=0; i<blockSize; i++)

@@ -42,7 +42,7 @@ void HMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, con
 

 void HMAC_Base::KeyInnerHash()

 {

-	assert(!m_innerHashKeyed);

+	CRYPTOPP_ASSERT(!m_innerHashKeyed);

 	HashTransformation &hash = AccessHash();

 	hash.Update(AccessIpad(), hash.BlockSize());

 	m_innerHashKeyed = true;