From 40230dd3bf5400ec3fda20cc791fb05c7a1c5b62 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 3 Dec 2016 00:32:07 -0500 Subject: Removed MAINTAIN_BACKWARDS_COMPATIBILITY_562 (Issue 70) --- eccrypto.h | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) (limited to 'eccrypto.h') diff --git a/eccrypto.h b/eccrypto.h index 49031483..ca04a54e 100644 --- a/eccrypto.h +++ b/eccrypto.h @@ -38,9 +38,7 @@ public: typedef Point Element; typedef IncompatibleCofactorMultiplication DefaultCofactorOption; -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 virtual ~DL_GroupParameters_EC() {} -#endif DL_GroupParameters_EC() : m_compress(false), m_encodeAsOID(true) {} DL_GroupParameters_EC(const OID &oid) @@ -156,9 +154,7 @@ class DL_PublicKey_EC : public DL_PublicKeyImpl > public: typedef typename EC::Point Element; -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 virtual ~DL_PublicKey_EC() {} -#endif void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} @@ -179,9 +175,7 @@ class DL_PrivateKey_EC : public DL_PrivateKeyImpl > public: typedef typename EC::Point Element; -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 virtual ~DL_PrivateKey_EC() {} -#endif void Initialize(const DL_GroupParameters_EC ¶ms, const Integer &x) {this->AccessGroupParameters() = params; this->SetPrivateExponent(x);} @@ -206,10 +200,6 @@ template , COFACTOR_OPTION> Domain; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECDH() {} -#endif }; //! \class ECMQV @@ -221,10 +211,6 @@ template , COFACTOR_OPTION> Domain; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECMQV() {} -#endif }; //! \class ECHMQV @@ -237,10 +223,6 @@ template , COFACTOR_OPTION, HASH> Domain; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECHMQV() {} -#endif }; typedef ECHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA1 >::Domain ECHMQV160; @@ -259,10 +241,6 @@ template , COFACTOR_OPTION, HASH> Domain; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECFHMQV() {} -#endif }; typedef ECFHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA1 >::Domain ECFHMQV160; @@ -278,10 +256,6 @@ struct DL_Keys_EC { typedef DL_PublicKey_EC PublicKey; typedef DL_PrivateKey_EC PrivateKey; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~DL_Keys_EC() {} -#endif }; // Forward declaration; documented below @@ -296,10 +270,6 @@ struct DL_Keys_ECDSA { typedef DL_PublicKey_EC PublicKey; typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest, ECDSA > PrivateKey; - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~DL_Keys_ECDSA() {} -#endif }; //! \class DL_Algorithm_ECDSA @@ -310,10 +280,6 @@ class DL_Algorithm_ECDSA : public DL_Algorithm_GDSA { public: CRYPTOPP_STATIC_CONSTEXPR const char* CRYPTOPP_API StaticAlgorithmName() {return "ECDSA";} - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~DL_Algorithm_ECDSA() {} -#endif }; //! \class DL_Algorithm_ECNR @@ -324,10 +290,6 @@ class DL_Algorithm_ECNR : public DL_Algorithm_NR { public: CRYPTOPP_STATIC_CONSTEXPR const char* CRYPTOPP_API StaticAlgorithmName() {return "ECNR";} - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~DL_Algorithm_ECNR() {} -#endif }; //! \class ECDSA @@ -338,9 +300,6 @@ public: template struct ECDSA : public DL_SS, DL_Algorithm_ECDSA, DL_SignatureMessageEncodingMethod_DSA, H> { -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECDSA() {} -#endif }; //! \class ECNR @@ -350,9 +309,6 @@ struct ECDSA : public DL_SS, DL_Algorithm_ECDSA, DL_Signat template struct ECNR : public DL_SS, DL_Algorithm_ECNR, DL_SignatureMessageEncodingMethod_NR, H> { -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECNR() {} -#endif }; @@ -400,10 +356,6 @@ struct ECIES ECIES > { static std::string CRYPTOPP_API StaticAlgorithmName() {return "ECIES";} // TODO: fix this after name is standardized - -#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 - virtual ~ECIES() {} -#endif }; NAMESPACE_END -- cgit v1.2.1