Revert "Merge remote-tracking branch 'upstream/master'" - not intended to be merged by me

This reverts commit 762c315566bce681e380641d1894251f984eac10, reversing
changes made to b48866631a5587e9348245fedd6f1e0871df35db.

1 files changed, 12 insertions, 12 deletions

diff --git a/eccrypto.h b/eccrypto.h
index a809f661..6642dec5 100644
--- a/eccrypto.h
+++ b/eccrypto.h
@@ -132,7 +132,7 @@ public:
 	const Integer& GetBasePointOrder() const {return this->GetSubgroupOrder();}

 	void LoadRecommendedParameters(const OID &oid) {Initialize(oid);}

 #endif

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_GroupParameters_EC() {}

 #endif

@@ -162,7 +162,7 @@ public:
 	// X509PublicKey

 	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);

 	void DEREncodePublicKey(BufferedTransformation &bt) const;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_PublicKey_EC() {}

 #endif

@@ -187,7 +187,7 @@ public:
 	// PKCS8PrivateKey

 	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);

 	void DEREncodePrivateKey(BufferedTransformation &bt) const;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_PrivateKey_EC() {}

 #endif

@@ -198,7 +198,7 @@ template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<E
 struct ECDH

 {

 	typedef DH_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION> Domain;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~ECDH() {}

 #endif

@@ -209,7 +209,7 @@ template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<E
 struct ECMQV

 {

 	typedef MQV_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION> Domain;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~ECMQV() {}

 #endif

@@ -259,7 +259,7 @@ struct DL_Keys_EC
 {

 	typedef DL_PublicKey_EC<EC> PublicKey;

 	typedef DL_PrivateKey_EC<EC> PrivateKey;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_Keys_EC() {}

 #endif

@@ -274,7 +274,7 @@ struct DL_Keys_ECDSA
 {

 	typedef DL_PublicKey_EC<EC> PublicKey;

 	typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<EC>, ECDSA<EC, SHA256> > PrivateKey;

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_Keys_ECDSA() {}

 #endif

@@ -286,7 +286,7 @@ class DL_Algorithm_ECDSA : public DL_Algorithm_GDSA<typename EC::Point>
 {

 public:

 	static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECDSA";}

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_Algorithm_ECDSA() {}

 #endif

@@ -298,7 +298,7 @@ class DL_Algorithm_ECNR : public DL_Algorithm_NR<typename EC::Point>
 {

 public:

 	static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECNR";}

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~DL_Algorithm_ECNR() {}

 #endif

@@ -336,12 +336,12 @@ struct ECIES
 		ECIES<EC> >

 {

 	static std::string CRYPTOPP_API StaticAlgorithmName() {return "ECIES";}	// TODO: fix this after name is standardized

-

+	

 #ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

 	virtual ~ECIES() {}

 #endif

-

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

+	

+#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_CLANG_VERSION >= 20800)

 } __attribute__((deprecated ("ECIES will be changing in the near future due to (1) an implementation bug and (2) an interop issue")));

 #elif (CRYPTOPP_GCC_VERSION)

 } __attribute__((deprecated));