From 399a1546de71f41598c15edada28e7f0d616f541 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 16 Sep 2016 11:27:15 -0400 Subject: 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 --- rsa.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rsa.cpp') diff --git a/rsa.cpp b/rsa.cpp index 3587fe80..fd0a17d8 100644 --- a/rsa.cpp +++ b/rsa.cpp @@ -108,13 +108,13 @@ void InvertibleRSAFunction::GenerateRandom(RandomNumberGenerator &rng, const Nam int modulusSize = 2048; alg.GetIntValue(Name::ModulusSize(), modulusSize) || alg.GetIntValue(Name::KeySize(), modulusSize); - assert(modulusSize >= 16); + CRYPTOPP_ASSERT(modulusSize >= 16); if (modulusSize < 16) throw InvalidArgument("InvertibleRSAFunction: specified modulus size is too small"); m_e = alg.GetValueWithDefault(Name::PublicExponent(), Integer(17)); - assert(m_e >= 3); assert(!m_e.IsEven()); + CRYPTOPP_ASSERT(m_e >= 3); CRYPTOPP_ASSERT(!m_e.IsEven()); if (m_e < 3 || m_e.IsEven()) throw InvalidArgument("InvertibleRSAFunction: invalid public exponent"); @@ -125,7 +125,7 @@ void InvertibleRSAFunction::GenerateRandom(RandomNumberGenerator &rng, const Nam m_q.GenerateRandom(rng, primeParam); m_d = m_e.InverseMod(LCM(m_p-1, m_q-1)); - assert(m_d.IsPositive()); + CRYPTOPP_ASSERT(m_d.IsPositive()); m_dp = m_d % (m_p-1); m_dq = m_d % (m_q-1); -- cgit v1.2.1