Removed remaining dummy parameters for VC6.0 workarounds (Issue 342)

1 files changed, 6 insertions, 14 deletions

diff --git a/fipstest.cpp b/fipstest.cpp
index 5b154dc3..35a35452 100644
--- a/fipstest.cpp
+++ b/fipstest.cpp
@@ -93,10 +93,8 @@ void X917RNG_KnownAnswerTest(
 	const char *key,

 	const char *seed,

 	const char *deterministicTimeVector,

-	const char *output,

-	CIPHER *dummy = NULL)

+	const char *output)

 {

-	CRYPTOPP_UNUSED(dummy);

 #ifdef OS_RNG_AVAILABLE

 	std::string decodedKey, decodedSeed, decodedDeterministicTimeVector;

 	StringSource(key, true, new HexDecoder(new StringSink(decodedKey)));

@@ -134,10 +132,8 @@ void SymmetricEncryptionKnownAnswerTest(
 	const char *cbc,

 	const char *cfb,

 	const char *ofb,

-	const char *ctr,

-	CIPHER *dummy = NULL)

+	const char *ctr)

 {

-	CRYPTOPP_UNUSED(dummy);

 	std::string decodedKey;

 	StringSource(key, true, new HexDecoder(new StringSink(decodedKey)));

 

@@ -170,17 +166,15 @@ void KnownAnswerTest(HashTransformation &hash, const char *message, const char *
 }

 

 template <class HASH>

-void SecureHashKnownAnswerTest(const char *message, const char *digest, HASH *dummy = NULL)

+void SecureHashKnownAnswerTest(const char *message, const char *digest)

 {

-	CRYPTOPP_UNUSED(dummy);

 	HASH hash;

 	KnownAnswerTest(hash, message, digest);

 }

 

 template <class MAC>

-void MAC_KnownAnswerTest(const char *key, const char *message, const char *digest, MAC *dummy = NULL)

+void MAC_KnownAnswerTest(const char *key, const char *message, const char *digest)

 {

-	CRYPTOPP_UNUSED(dummy);

 	std::string decodedKey;

 	StringSource(key, true, new HexDecoder(new StringSink(decodedKey)));

 

@@ -189,12 +183,11 @@ void MAC_KnownAnswerTest(const char *key, const char *message, const char *diges
 }

 

 template <class SCHEME>

-void SignatureKnownAnswerTest(const char *key, const char *message, const char *signature, SCHEME *dummy = NULL)

+void SignatureKnownAnswerTest(const char *key, const char *message, const char *signature)

 {

 	typename SCHEME::Signer signer(StringSource(key, true, new HexDecoder).Ref());

 	typename SCHEME::Verifier verifier(signer);

 

-	CRYPTOPP_UNUSED(dummy);

 	RandomPool rng;

 	EqualityComparisonFilter comparison;

 

@@ -267,12 +260,11 @@ void SignaturePairwiseConsistencyTest(const PK_Signer &signer, const PK_Verifier
 }

 

 template <class SCHEME>

-void SignaturePairwiseConsistencyTest(const char *key, SCHEME *dummy = NULL)

+void SignaturePairwiseConsistencyTest(const char *key)

 {

 	typename SCHEME::Signer signer(StringSource(key, true, new HexDecoder).Ref());

 	typename SCHEME::Verifier verifier(signer);

 

-	CRYPTOPP_UNUSED(dummy);

 	SignaturePairwiseConsistencyTest(signer, verifier);

 }