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/esign.cpp b/esign.cpp
index 4d79ad59..7fef8082 100644
--- a/esign.cpp
+++ b/esign.cpp
@@ -125,7 +125,7 @@ void InvertibleESIGNFunction::GenerateRandom(RandomNumberGenerator &rng, const N
 

 	m_n = m_p * m_p * m_q;

 

-	assert(m_n.BitCount() == (unsigned int)modulusSize);

+	CRYPTOPP_ASSERT(m_n.BitCount() == (unsigned int)modulusSize);

 }

 

 void InvertibleESIGNFunction::BERDecode(BufferedTransformation &bt)

@@ -174,7 +174,7 @@ Integer InvertibleESIGNFunction::CalculateRandomizedInverse(RandomNumberGenerato
 	ModularArithmetic modp(m_p);

 	Integer t = modp.Divide(w0 * r % m_p, m_e * re % m_p);

 	Integer s = r + t*pq;

-	assert(s < m_n);

+	CRYPTOPP_ASSERT(s < m_n);

 #if 0

 	using namespace std;

 	cout << "f = " << x << endl;