Removed MAINTAIN_BACKWARDS_COMPATIBILITY_562 (Issue 70)

1 files changed, 1 insertions, 7 deletions

diff --git a/elgamal.h b/elgamal.h
index 6572269b..4c763ac1 100644
--- a/elgamal.h
+++ b/elgamal.h
@@ -24,10 +24,7 @@ class CRYPTOPP_NO_VTABLE ElGamalBase : public DL_KeyAgreementAlgorithm_DH<Intege
 					public DL_SymmetricEncryptionAlgorithm

 {

 public:

-

-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~ElGamalBase() {}

-#endif

 

 	void Derive(const DL_GroupParameters<Integer> &groupParams, byte *derivedKey, size_t derivedLength, const Integer &agreedElement, const Integer &ephemeralPublicKey, const NameValuePairs &derivationParams) const

 	{

@@ -103,10 +100,7 @@ template <class BASE, class SCHEME_OPTIONS, class KEY>
 class ElGamalObjectImpl : public DL_ObjectImplBase<BASE, SCHEME_OPTIONS, KEY>, public ElGamalBase

 {

 public:

-

-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~ElGamalObjectImpl() {}

-#endif

 

 	size_t FixedMaxPlaintextLength() const {return this->MaxPlaintextLength(FixedCiphertextLength());}

 	size_t FixedCiphertextLength() const {return this->CiphertextLength(0);}

@@ -138,7 +132,7 @@ struct ElGamal
 {

 	typedef DL_CryptoSchemeOptions<ElGamal, ElGamalKeys, int, int, int> SchemeOptions;

 

-  CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "ElgamalEnc/Crypto++Padding";}

+	CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "ElgamalEnc/Crypto++Padding";}

 

 	typedef SchemeOptions::GroupParameters GroupParameters;

 	//! implements PK_Encryptor interface