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, 6 insertions, 6 deletions

diff --git a/default.h b/default.h
index 6b30f2e4..00ec6647 100644
--- a/default.h
+++ b/default.h
@@ -48,7 +48,7 @@ private:
 	SecByteBlock m_passphrase;

 	CBC_Mode<DefaultBlockCipher>::Encryption m_cipher;

 

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

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

 } __attribute__((deprecated ("DefaultEncryptor will be changing in the near future because the algorithms are no longer secure")));

 #elif (CRYPTOPP_GCC_VERSION)

 } __attribute__((deprecated));

@@ -68,7 +68,7 @@ public:
 	//! \param attachment a BufferedTransformation to attach to this object

 	//! \param throwException a flag specifiying whether an Exception should be thrown on error

 	DefaultDecryptor(const char *passphrase, BufferedTransformation *attachment = NULL, bool throwException=true);

-

+	

 	//! \brief Constructs a DefaultDecryptor

 	//! \param passphrase a byte string password

 	//! \param passphraseLength the length of the byte string password

@@ -79,7 +79,7 @@ public:
 	class Err : public Exception

 	{

 	public:

-		Err(const std::string &s)

+		Err(const std::string &s) 

 			: Exception(DATA_INTEGRITY_CHECK_FAILED, s) {}

 	};

 	class KeyBadErr : public Err {public: KeyBadErr() : Err("DefaultDecryptor: cannot decrypt message with this passphrase") {}};

@@ -101,7 +101,7 @@ private:
 	member_ptr<FilterWithBufferedInput> m_decryptor;

 	bool m_throwException;

 

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

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

 } __attribute__((deprecated ("DefaultDecryptor will be changing in the near future because the algorithms are no longer secure")));

 #elif (CRYPTOPP_GCC_VERSION)

 } __attribute__((deprecated));

@@ -139,7 +139,7 @@ protected:
 private:

 	member_ptr<DefaultMAC> m_mac;

 

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

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

 } __attribute__((deprecated ("DefaultEncryptorWithMAC will be changing in the near future because the algorithms are no longer secure")));

 #elif (CRYPTOPP_GCC_VERSION)

 } __attribute__((deprecated));

@@ -188,7 +188,7 @@ private:
 	HashVerifier *m_hashVerifier;

 	bool m_throwException;

 

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

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

 } __attribute__((deprecated ("DefaultDecryptorWithMAC will be changing in the near future because the algorithms are no longer secure")));

 #elif (CRYPTOPP_GCC_VERSION)

 } __attribute__((deprecated));