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

diff --git a/asn.cpp b/asn.cpp
index 13cd50c3..297ff010 100644
--- a/asn.cpp
+++ b/asn.cpp
@@ -244,7 +244,7 @@ size_t OID::DecodeValue(BufferedTransformation &bt, word32 &v)
 

 void OID::DEREncode(BufferedTransformation &bt) const

 {

-	assert(m_values.size() >= 2);

+	CRYPTOPP_ASSERT(m_values.size() >= 2);

 	ByteQueue temp;

 	temp.Put(byte(m_values[0] * 40 + m_values[1]));

 	for (size_t i=2; i<m_values.size(); i++)

@@ -412,7 +412,7 @@ BERGeneralDecoder::~BERGeneralDecoder()
 	}

 	catch (const Exception&)

 	{

-		// assert(0);

+		// CRYPTOPP_ASSERT(0);

 	}

 }

 

@@ -506,7 +506,7 @@ DERGeneralEncoder::~DERGeneralEncoder()
 	}

 	catch (const Exception&)

 	{

-		assert(0);

+		CRYPTOPP_ASSERT(0);

 	}

 }