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

diff --git a/gfpcrypt.cpp b/gfpcrypt.cpp
index 2a3b6974..8edd8553 100644
--- a/gfpcrypt.cpp
+++ b/gfpcrypt.cpp
@@ -82,8 +82,8 @@ void DL_SignatureMessageEncodingMethod_DSA::ComputeMessageRepresentative(RandomN
 {

 	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(recoverableMessage), CRYPTOPP_UNUSED(recoverableMessageLength);

 	CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);

-	assert(recoverableMessageLength == 0);

-	assert(hashIdentifier.second == 0);

+	CRYPTOPP_ASSERT(recoverableMessageLength == 0);

+	CRYPTOPP_ASSERT(hashIdentifier.second == 0);

 

 	const size_t representativeByteLength = BitsToBytes(representativeBitLength);

 	const size_t digestSize = hash.DigestSize();

@@ -109,8 +109,8 @@ void DL_SignatureMessageEncodingMethod_NR::ComputeMessageRepresentative(RandomNu
 	CRYPTOPP_UNUSED(hash); CRYPTOPP_UNUSED(hashIdentifier); CRYPTOPP_UNUSED(messageEmpty);

 	CRYPTOPP_UNUSED(representative); CRYPTOPP_UNUSED(representativeBitLength);

 

-	assert(recoverableMessageLength == 0);

-	assert(hashIdentifier.second == 0);

+	CRYPTOPP_ASSERT(recoverableMessageLength == 0);

+	CRYPTOPP_ASSERT(hashIdentifier.second == 0);

 	const size_t representativeByteLength = BitsToBytes(representativeBitLength);

 	const size_t digestSize = hash.DigestSize();

 	const size_t paddingLength = SaturatingSubtract(representativeByteLength, digestSize);