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/pkcspad.cpp b/pkcspad.cpp
index 85eac6ae..7716256f 100644
--- a/pkcspad.cpp
+++ b/pkcspad.cpp
@@ -7,7 +7,7 @@
 

 #include "pkcspad.h"

 #include "misc.h"

-#include <assert.h>

+#include "trap.h"

 

 NAMESPACE_BEGIN(CryptoPP)

 

@@ -32,7 +32,7 @@ size_t PKCS_EncryptionPaddingScheme::MaxUnpaddedLength(size_t paddedLength) cons
 void PKCS_EncryptionPaddingScheme::Pad(RandomNumberGenerator& rng, const byte *input, size_t inputLen, byte *pkcsBlock, size_t pkcsBlockLen, const NameValuePairs& parameters) const

 {

 	CRYPTOPP_UNUSED(parameters);

-	assert (inputLen <= MaxUnpaddedLength(pkcsBlockLen));	// this should be checked by caller

+	CRYPTOPP_ASSERT (inputLen <= MaxUnpaddedLength(pkcsBlockLen));	// this should be checked by caller

 

 	// convert from bit length to byte length

 	if (pkcsBlockLen % 8 != 0)

@@ -73,7 +73,7 @@ DecodingResult PKCS_EncryptionPaddingScheme::Unpad(const byte *pkcsBlock, size_t
 	size_t i=1;

 	while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body

 		}

-	assert(i==pkcsBlockLen || pkcsBlock[i-1]==0);

+	CRYPTOPP_ASSERT(i==pkcsBlockLen || pkcsBlock[i-1]==0);

 

 	size_t outputLen = pkcsBlockLen - i;

 	invalid = (outputLen > maxOutputLen) || invalid;

@@ -96,7 +96,7 @@ void PKCS1v15_SignatureMessageEncodingMethod::ComputeMessageRepresentative(Rando
 {

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

 	CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);

-	assert(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize()));

+	CRYPTOPP_ASSERT(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize()));

 

 	size_t pkcsBlockLen = representativeBitLength;

 	// convert from bit length to byte length