Revert "Clear Visual Studio warnings (Issue 412)"

This reverts commit eb3b27a6a543. The change broke GCC 4.8 and unknown version of Clang on OS X. UB reported the OS X break, and JW found duplicated the break on a ARM CubieTruck with GCC 4.8.
2025-03-01 01:46:55 +00:00 · 2017-06-02 05:06:56 -04:00 · 2017-06-02 05:06:56 -04:00 · c3871aec94
commit c3871aec94
parent dd42fa3ef6
29 changed files with 12 additions and 155 deletions
--- a/algparam.h
+++ b/algparam.h
@ -11,12 +11,10 @@
 #include "config.h"
 #include "cryptlib.h"

-#if CRYPTOPP_MSC_VERSION
+// TODO: fix 6011 when the API/ABI can change
+#if (CRYPTOPP_MSC_VERSION >= 1400)
 # pragma warning(push)
-# pragma warning(disable: 4231 4275)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6011 6386 28193)
-# endif
+# pragma warning(disable: 6011 28193)
 #endif

 #include "smartptr.h"
--- a/bench1.cpp
+++ b/bench1.cpp
@ -16,14 +16,6 @@
 #include "cpu.h"
 #include "drbg.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4355)
-#endif
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)

--- a/bench2.cpp
+++ b/bench2.cpp
@ -30,10 +30,6 @@
 #include "oids.h"
 #include "randpool.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)

--- a/channels.cpp
+++ b/channels.cpp
@ -8,10 +8,6 @@
 #include "cryptlib.h"
 #include "channels.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 #if 0
--- a/channels.h
+++ b/channels.h
@ -12,11 +12,6 @@
 #include "smartptr.h"
 #include "stdcpp.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 #if 0
@ -136,8 +131,4 @@ private:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/config.h
+++ b/config.h
@ -732,8 +732,6 @@ NAMESPACE_END
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL
 #elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#elif !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
 #else
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL
 #endif
@ -748,8 +746,6 @@ NAMESPACE_END
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class
 #elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
-#elif !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
 #else
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class
 #endif
--- a/cryptlib.h
+++ b/cryptlib.h
@ -99,7 +99,7 @@ and getting us started on the manual.

 #if CRYPTOPP_MSC_VERSION
 # pragma warning(push)
-# pragma warning(disable: 4127 4189 4505 4702)
+# pragma warning(disable: 4127 4189 4702)
 #endif

 NAMESPACE_BEGIN(CryptoPP)
--- a/datatest.cpp
+++ b/datatest.cpp
@ -25,8 +25,8 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
+#if defined(__COVERITY__)
+extern "C" void __coverity_tainted_data_sanitize__(void *);
 #endif

 NAMESPACE_BEGIN(CryptoPP)
--- a/dlltest.cpp
+++ b/dlltest.cpp
@ -6,10 +6,6 @@
 #include "cryptlib.h"
 #include "filters.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)

--- a/ec2n.h
+++ b/ec2n.h
@ -17,11 +17,6 @@
 #include "smartptr.h"
 #include "pubkey.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \class EC2N
@ -128,8 +123,4 @@ private:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/eccrypto.h
+++ b/eccrypto.h
@ -22,11 +22,6 @@
 #include "ecp.h"
 #include "ec2n.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \brief Elliptic Curve Parameters
@ -670,8 +665,4 @@ CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest<D

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/ecp.h
+++ b/ecp.h
@ -15,11 +15,6 @@
 #include "smartptr.h"
 #include "pubkey.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \class ECP
@ -145,8 +140,4 @@ private:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/filters.cpp
+++ b/filters.cpp
@ -4,7 +4,7 @@
 #include "config.h"

 #if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100 4189 4355)
+# pragma warning(disable: 4100 4189)
 #endif

 #if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
--- a/filters.h
+++ b/filters.h
@ -10,7 +10,7 @@

 #if CRYPTOPP_MSC_VERSION
 # pragma warning(push)
-# pragma warning(disable: 4127 4189 4231 4275 4514)
+# pragma warning(disable: 4127 4189 4514)
 #endif

 #include "cryptlib.h"
--- a/gf2n.h
+++ b/gf2n.h
@ -14,11 +14,6 @@

 #include <iosfwd>

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \brief Polynomial with Coefficients in GF(2)
@ -380,8 +375,4 @@ template<> inline void swap(CryptoPP::PolynomialMod2 &a, CryptoPP::PolynomialMod
 NAMESPACE_END
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@ -12,7 +12,7 @@

 #if CRYPTOPP_MSC_VERSION
 # pragma warning(push)
-# pragma warning(disable: 4189 4231 4275)
+# pragma warning(disable: 4189)
 #endif

 #include "cryptlib.h"
--- a/iterhash.h
+++ b/iterhash.h
@ -1,5 +1,3 @@
-// strciphr.h - originally written and placed in the public domain by Wei Dai
-
 #ifndef CRYPTOPP_ITERHASH_H
 #define CRYPTOPP_ITERHASH_H

@ -8,14 +6,6 @@
 #include "misc.h"
 #include "simple.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6011 6386 28193)
-# endif
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \class HashInputTooLong
@ -189,8 +179,4 @@ protected:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/modarith.h
+++ b/modarith.h
@ -14,11 +14,6 @@
 #include "secblock.h"
 #include "misc.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup<Integer>;
@ -318,8 +313,4 @@ private:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/modes.h
+++ b/modes.h
@ -20,14 +20,6 @@
 # pragma GCC diagnostic ignored "-Wsign-conversion"
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6011 6386 28193)
-# endif
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 //! \class CipherModeDocumentation
@ -483,10 +475,6 @@ struct CBC_CTS_Mode_ExternalCipher : public CipherModeDocumentation
 NAMESPACE_END

 // Issue 340
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
 # pragma GCC diagnostic pop
 #endif
--- a/modexppc.h
+++ b/modexppc.h
@ -9,11 +9,6 @@
 #include "smartptr.h"
 #include "pubkey.h"

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)

 CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl<Integer>;
@ -41,8 +36,4 @@ private:

 NAMESPACE_END

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
 #endif
--- a/regtest1.cpp
+++ b/regtest1.cpp
@ -34,10 +34,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 USING_NAMESPACE(CryptoPP)

 // Unkeyed ciphers
--- a/regtest2.cpp
+++ b/regtest2.cpp
@ -61,10 +61,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 USING_NAMESPACE(CryptoPP)

 // Shared key ciphers
--- a/regtest3.cpp
+++ b/regtest3.cpp
@ -26,10 +26,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 USING_NAMESPACE(CryptoPP)

 void RegisterFactories3()
--- a/secblock.h
+++ b/secblock.h
@ -12,9 +12,9 @@

 #if CRYPTOPP_MSC_VERSION
 # pragma warning(push)
-# pragma warning(disable: 4231 4275 4700)
+# pragma warning(disable: 4700)
 # if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6011 6386 28193)
+#  pragma warning(disable: 6386)
 # endif
 #endif

--- a/strciphr.h
+++ b/strciphr.h
@ -32,7 +32,7 @@

 #if CRYPTOPP_MSC_VERSION
 # pragma warning(push)
-# pragma warning(disable: 4127 4189 4231 4275)
+# pragma warning(disable: 4127 4189)
 #endif

 #include "cryptlib.h"
--- a/validat0.cpp
+++ b/validat0.cpp
@ -31,10 +31,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)

--- a/validat1.cpp
+++ b/validat1.cpp
@ -64,10 +64,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)

--- a/validat2.cpp
+++ b/validat2.cpp
@ -51,10 +51,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)

--- a/validat3.cpp
+++ b/validat3.cpp
@ -44,10 +44,6 @@
 # pragma strict_gs_check (on)
 #endif

-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 NAMESPACE_BEGIN(Test)