Add asserts to validation routines

1 files changed, 15 insertions, 0 deletions

diff --git a/luc.cpp b/luc.cpp
index 6abe2e48..c9faca62 100644
--- a/luc.cpp
+++ b/luc.cpp
@@ -74,7 +74,9 @@ bool LUCFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const
 	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(level);

 	bool pass = true;

 	pass = pass && m_n > Integer::One() && m_n.IsOdd();

+	CRYPTOPP_ASSERT(pass);

 	pass = pass && m_e > Integer::One() && m_e.IsOdd() && m_e < m_n;

+	CRYPTOPP_ASSERT(pass);

 	return pass;

 }

 

@@ -177,20 +179,33 @@ Integer InvertibleLUCFunction::CalculateInverse(RandomNumberGenerator &rng, cons
 bool InvertibleLUCFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const

 {

 	bool pass = LUCFunction::Validate(rng, level);

+	CRYPTOPP_ASSERT(pass);

 	pass = pass && m_p > Integer::One() && m_p.IsOdd() && m_p < m_n;

+	CRYPTOPP_ASSERT(pass);

 	pass = pass && m_q > Integer::One() && m_q.IsOdd() && m_q < m_n;

+	CRYPTOPP_ASSERT(pass);

 	pass = pass && m_u.IsPositive() && m_u < m_p;

+	CRYPTOPP_ASSERT(pass);

 	if (level >= 1)

 	{

 		pass = pass && m_p * m_q == m_n;

+		CRYPTOPP_ASSERT(pass);

 		pass = pass && RelativelyPrime(m_e, m_p+1);

+		CRYPTOPP_ASSERT(pass);

 		pass = pass && RelativelyPrime(m_e, m_p-1);

+		CRYPTOPP_ASSERT(pass);

 		pass = pass && RelativelyPrime(m_e, m_q+1);

+		CRYPTOPP_ASSERT(pass);

 		pass = pass && RelativelyPrime(m_e, m_q-1);

+		CRYPTOPP_ASSERT(pass);

 		pass = pass && m_u * m_q % m_p == 1;

+		CRYPTOPP_ASSERT(pass);

 	}

 	if (level >= 2)

+	{

 		pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2);

+		CRYPTOPP_ASSERT(pass);

+	}

 	return pass;

 }