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

diff --git a/pwdbased.h b/pwdbased.h
index 539c9a7e..cc0bcedb 100644
--- a/pwdbased.h
+++ b/pwdbased.h
@@ -83,8 +83,8 @@ template <class T>
 unsigned int PKCS5_PBKDF1<T>::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const

 {

 	CRYPTOPP_UNUSED(purpose);

-	assert(derivedLen <= MaxDerivedKeyLength());

-	assert(iterations > 0 || timeInSeconds > 0);

+	CRYPTOPP_ASSERT(derivedLen <= MaxDerivedKeyLength());

+	CRYPTOPP_ASSERT(iterations > 0 || timeInSeconds > 0);

 

 	if (!iterations)

 		iterations = 1;

@@ -113,8 +113,8 @@ template <class T>
 unsigned int PKCS5_PBKDF2_HMAC<T>::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const

 {

 	CRYPTOPP_UNUSED(purpose);

-	assert(derivedLen <= MaxDerivedKeyLength());

-	assert(iterations > 0 || timeInSeconds > 0);

+	CRYPTOPP_ASSERT(derivedLen <= MaxDerivedKeyLength());

+	CRYPTOPP_ASSERT(iterations > 0 || timeInSeconds > 0);

 

 	if (!iterations)

 		iterations = 1;

@@ -183,8 +183,8 @@ public:
 template <class T>

 unsigned int PKCS12_PBKDF<T>::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const

 {

-	assert(derivedLen <= MaxDerivedKeyLength());

-	assert(iterations > 0 || timeInSeconds > 0);

+	CRYPTOPP_ASSERT(derivedLen <= MaxDerivedKeyLength());

+	CRYPTOPP_ASSERT(iterations > 0 || timeInSeconds > 0);

 

 	if (!iterations)

 		iterations = 1;