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/ecp.cpp b/ecp.cpp
index c718a527..eae99eb1 100644
--- a/ecp.cpp
+++ b/ecp.cpp
@@ -140,7 +140,7 @@ void ECP::EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const
 {

 	ArraySink sink(encodedPoint, EncodedPointSize(compressed));

 	EncodePoint(sink, P, compressed);

-	assert(sink.TotalPutLength() == EncodedPointSize(compressed));

+	CRYPTOPP_ASSERT(sink.TotalPutLength() == EncodedPointSize(compressed));

 }

 

 ECP::Point ECP::BERDecodePoint(BufferedTransformation &bt) const

@@ -384,7 +384,7 @@ void ECP::SimultaneousMultiply(ECP::Point *results, const ECP::Point &P, const I
 

 	for (i=0; i<expCount; i++)

 	{

-		assert(expBegin->NotNegative());

+		CRYPTOPP_ASSERT(expBegin->NotNegative());

 		exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 5));

 		exponents[i].FindNextWindow();

 	}