arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear unused parameter warnings for GCC with -Wextra (GH #856)

pull/867/head
Jeffrey Walton 2019-07-03 15:17:53 -04:00
parent cd0d145635
commit 2baa37efac
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
validat8.cpp
View File

@ -148,13 +148,20 @@ bool ValidateECP_Encrypt()
} }
// https://github.com/weidai11/cryptopp/issues/856 // https://github.com/weidai11/cryptopp/issues/856
class NULLHash : public CryptoPP::IteratedHashWithStaticTransform // Not to be confused with NullHash in trunhash.h.
<CryptoPP::word32, CryptoPP::BigEndian, 32, 0, NULLHash, 0> class NULL_Hash : public CryptoPP::IteratedHashWithStaticTransform
<CryptoPP::word32, CryptoPP::BigEndian, 32, 0, NULL_Hash, 0>
{ {
public: public:
static void InitState(HashWordType *state) {} static void InitState(HashWordType *state) {
static void Transform(CryptoPP::word32 *digest, const CryptoPP::word32 *data) {} CRYPTOPP_UNUSED(state);
static const char *StaticAlgorithmName() {return "NULL HASH";} }
static void Transform(CryptoPP::word32 *digest, const CryptoPP::word32 *data) {
CRYPTOPP_UNUSED(digest); CRYPTOPP_UNUSED(data);
}
static const char *StaticAlgorithmName() {
return "NULL_Hash";
}
}; };
// https://github.com/weidai11/cryptopp/issues/856 // https://github.com/weidai11/cryptopp/issues/856
@ -164,7 +171,7 @@ struct ECIES_NULLDigest
DL_Keys_EC<EC>, DL_Keys_EC<EC>,
DL_KeyAgreementAlgorithm_DH<typename EC::Point, COFACTOR_OPTION>, DL_KeyAgreementAlgorithm_DH<typename EC::Point, COFACTOR_OPTION>,
DL_KeyDerivationAlgorithm_P1363<typename EC::Point, DHAES_MODE, P1363_KDF2<HASH> >, DL_KeyDerivationAlgorithm_P1363<typename EC::Point, DHAES_MODE, P1363_KDF2<HASH> >,
DL_EncryptionAlgorithm_Xor<HMAC<NULLHash>, DHAES_MODE, LABEL_OCTETS>, DL_EncryptionAlgorithm_Xor<HMAC<NULL_Hash>, DHAES_MODE, LABEL_OCTETS>,
ECIES<EC> > ECIES<EC> >
{ {
// TODO: fix this after name is standardized // TODO: fix this after name is standardized