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/seal.cpp b/seal.cpp
index 9babbfa1..d827c1d6 100644
--- a/seal.cpp
+++ b/seal.cpp
@@ -73,7 +73,7 @@ template <class B>
 void SEAL_Policy<B>::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length)

 {

 	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(IV), CRYPTOPP_UNUSED(length);

-	assert(length==4);

+	CRYPTOPP_ASSERT(length==4);

 

 	m_outsideCounter = IV ? GetWord<word32>(false, BIG_ENDIAN_ORDER, IV) : 0;

 	m_startCount = m_outsideCounter;

@@ -93,7 +93,7 @@ void SEAL_Policy<B>::OperateKeystream(KeystreamOperation operation, byte *output
 	word32 a, b, c, d, n1, n2, n3, n4;

 	unsigned int p, q;

 

-	assert(IsAlignedOn(m_T.begin(),GetAlignmentOf<word32>()));

+	CRYPTOPP_ASSERT(IsAlignedOn(m_T.begin(),GetAlignmentOf<word32>()));

 	for (size_t iteration = 0; iteration < iterationCount; ++iteration)

 	{

 		#define Ttab(x) *(word32 *)(void*)((byte *)m_T.begin()+x)