From 86b89cd18b9df59eee1d2562a94d80665241b392 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 17 Dec 2016 22:44:22 -0500 Subject: [PATCH] Removed remaining dummy parameters for VC6.0 workarounds (Issue 342) --- factory.h | 62 ++++++++++++++++++++++++++++++++++++++++++---------- fipstest.cpp | 20 +++++------------ 2 files changed, 57 insertions(+), 25 deletions(-) diff --git a/factory.h b/factory.h index 693db6dd..112a5294 100644 --- a/factory.h +++ b/factory.h @@ -1,5 +1,8 @@ // factory.h - written and placed in the public domain by Wei Dai +//! \file factory.h +//! \brief Classes and functions for registering and locating library objects + #ifndef CRYPTOPP_OBJFACT_H #define CRYPTOPP_OBJFACT_H @@ -9,7 +12,9 @@ NAMESPACE_BEGIN(CryptoPP) -//! _ +//! \class ObjectFactory +//! \brief Object factory interface for registering objects +//! \tparam AbstractClass Base class interface of the object template class ObjectFactory { @@ -18,7 +23,10 @@ public: virtual AbstractClass * CreateObject() const =0; }; -//! _ +//! \class DefaultObjectFactory +//! \brief Object factory for registering objects +//! \tparam AbstractClass Base class interface of the object +//! \tparam ConcreteClass Class object template class DefaultObjectFactory : public ObjectFactory { @@ -29,7 +37,10 @@ public: } }; -//! _ +//! \class ObjectFactoryRegistry +//! \brief Object factory registry +//! \tparam AbstractClass Base class interface of the object +//! \tparam instance unique identifier template class ObjectFactoryRegistry { @@ -94,6 +105,11 @@ ObjectFactoryRegistry & ObjectFactoryRegistry struct RegisterDefaultFactoryFor { @@ -106,34 +122,58 @@ struct RegisterDefaultFactoryFor } }; +//! \fn RegisterAsymmetricCipherDefaultFactories +//! \brief Register asymmetric ciphers +//! \tparam SchemeClass interface of the object under a scheme +//! \details Schemes include asymmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! signature schemes (registers SchemeClass::Signer and SchemeClass::Verifier), +//! symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! authenticated symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), etc. template -void RegisterAsymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) +void RegisterAsymmetricCipherDefaultFactories(const char *name=NULL) { - CRYPTOPP_UNUSED(dummy); RegisterDefaultFactoryFor((const char *)name); RegisterDefaultFactoryFor((const char *)name); } +//! \fn RegisterSignatureSchemeDefaultFactories +//! \brief Register signature schemes +//! \tparam SchemeClass interface of the object under a scheme +//! \details Schemes include asymmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! signature schemes (registers SchemeClass::Signer and SchemeClass::Verifier), +//! symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! authenticated symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), etc. template -void RegisterSignatureSchemeDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) +void RegisterSignatureSchemeDefaultFactories(const char *name=NULL) { - CRYPTOPP_UNUSED(dummy); RegisterDefaultFactoryFor((const char *)name); RegisterDefaultFactoryFor((const char *)name); } +//! \fn RegisterSymmetricCipherDefaultFactories +//! \brief Register symmetric ciphers +//! \tparam SchemeClass interface of the object under a scheme +//! \details Schemes include asymmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! signature schemes (registers SchemeClass::Signer and SchemeClass::Verifier), +//! symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! authenticated symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), etc. template -void RegisterSymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) +void RegisterSymmetricCipherDefaultFactories(const char *name=NULL) { - CRYPTOPP_UNUSED(dummy); RegisterDefaultFactoryFor((const char *)name); RegisterDefaultFactoryFor((const char *)name); } +//! \fn RegisterAuthenticatedSymmetricCipherDefaultFactories +//! \brief Register authenticated symmetric ciphers +//! \tparam SchemeClass interface of the object under a scheme +//! \details Schemes include asymmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! signature schemes (registers SchemeClass::Signer and SchemeClass::Verifier), +//! symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), +//! authenticated symmetric ciphers (registers SchemeClass::Encryptor and SchemeClass::Decryptor), etc. template -void RegisterAuthenticatedSymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) +void RegisterAuthenticatedSymmetricCipherDefaultFactories(const char *name=NULL) { - CRYPTOPP_UNUSED(dummy); RegisterDefaultFactoryFor((const char *)name); RegisterDefaultFactoryFor((const char *)name); } 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 -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 -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 -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 -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); }