diff options
author | Jeffrey Walton <noloader@gmail.com> | 2017-06-02 05:18:52 -0400 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2017-06-02 05:18:52 -0400 |
commit | 7ac77ca9ac780a3b027e59d23433a5e1e027e93f (patch) | |
tree | a0ef6365da4f658f632316fbd4d0804dd20e713f | |
parent | c3871aec948013c1a4d5613050c659520f59e2e4 (diff) | |
download | cryptopp-git-7ac77ca9ac780a3b027e59d23433a5e1e027e93f.tar.gz |
Revert "Revert "Clear Visual Studio warnings (Issue 412)""
This reverts commit c3871aec948013c1a4d5613050c659520f59e2e4.
-rw-r--r-- | algparam.h | 8 | ||||
-rw-r--r-- | bench1.cpp | 8 | ||||
-rw-r--r-- | bench2.cpp | 4 | ||||
-rw-r--r-- | channels.cpp | 4 | ||||
-rw-r--r-- | channels.h | 9 | ||||
-rw-r--r-- | config.h | 4 | ||||
-rw-r--r-- | cryptlib.h | 2 | ||||
-rw-r--r-- | datatest.cpp | 4 | ||||
-rw-r--r-- | dlltest.cpp | 4 | ||||
-rw-r--r-- | ec2n.h | 9 | ||||
-rw-r--r-- | eccrypto.h | 9 | ||||
-rw-r--r-- | ecp.h | 9 | ||||
-rw-r--r-- | filters.cpp | 2 | ||||
-rw-r--r-- | filters.h | 2 | ||||
-rw-r--r-- | gf2n.h | 9 | ||||
-rw-r--r-- | gfpcrypt.h | 2 | ||||
-rw-r--r-- | iterhash.h | 14 | ||||
-rw-r--r-- | modarith.h | 9 | ||||
-rw-r--r-- | modes.h | 12 | ||||
-rw-r--r-- | modexppc.h | 9 | ||||
-rw-r--r-- | regtest1.cpp | 4 | ||||
-rw-r--r-- | regtest2.cpp | 4 | ||||
-rw-r--r-- | regtest3.cpp | 4 | ||||
-rw-r--r-- | secblock.h | 4 | ||||
-rw-r--r-- | strciphr.h | 2 | ||||
-rw-r--r-- | validat0.cpp | 4 | ||||
-rw-r--r-- | validat1.cpp | 4 | ||||
-rw-r--r-- | validat2.cpp | 4 | ||||
-rw-r--r-- | validat3.cpp | 4 |
29 files changed, 155 insertions, 12 deletions
@@ -11,10 +11,12 @@ #include "config.h"
#include "cryptlib.h"
-// TODO: fix 6011 when the API/ABI can change
-#if (CRYPTOPP_MSC_VERSION >= 1400)
+#if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 6011 28193)
+# pragma warning(disable: 4231 4275)
+# if (CRYPTOPP_MSC_VERSION >= 1400)
+# pragma warning(disable: 6011 6386 28193)
+# endif
#endif
#include "smartptr.h"
@@ -16,6 +16,14 @@ #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)
@@ -30,6 +30,10 @@ #include "oids.h"
#include "randpool.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test)
diff --git a/channels.cpp b/channels.cpp index 62419fdd..ec7a98a0 100644 --- a/channels.cpp +++ b/channels.cpp @@ -8,6 +8,10 @@ #include "cryptlib.h"
#include "channels.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
#if 0
@@ -12,6 +12,11 @@ #include "smartptr.h"
#include "stdcpp.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(push)
+# pragma warning(disable: 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
#if 0
@@ -131,4 +136,8 @@ private: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -732,6 +732,8 @@ 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
@@ -746,6 +748,8 @@ 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
@@ -99,7 +99,7 @@ and getting us started on the manual. #if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 4127 4189 4702)
+# pragma warning(disable: 4127 4189 4505 4702)
#endif
NAMESPACE_BEGIN(CryptoPP)
diff --git a/datatest.cpp b/datatest.cpp index 805fcd03..2f9bcb5f 100644 --- a/datatest.cpp +++ b/datatest.cpp @@ -25,8 +25,8 @@ # pragma strict_gs_check (on)
#endif
-#if defined(__COVERITY__)
-extern "C" void __coverity_tainted_data_sanitize__(void *);
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
#endif
NAMESPACE_BEGIN(CryptoPP)
diff --git a/dlltest.cpp b/dlltest.cpp index 27def6f0..102fd7d0 100644 --- a/dlltest.cpp +++ b/dlltest.cpp @@ -6,6 +6,10 @@ #include "cryptlib.h"
#include "filters.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
USING_NAMESPACE(CryptoPP)
USING_NAMESPACE(std)
@@ -17,6 +17,11 @@ #include "smartptr.h"
#include "pubkey.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(push)
+# pragma warning(disable: 4231 4275)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
//! \class EC2N
@@ -123,4 +128,8 @@ private: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -22,6 +22,11 @@ #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
@@ -665,4 +670,8 @@ CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest<D NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -15,6 +15,11 @@ #include "smartptr.h"
#include "pubkey.h"
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(push)
+# pragma warning(disable: 4231 4275)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
//! \class ECP
@@ -140,4 +145,8 @@ private: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
diff --git a/filters.cpp b/filters.cpp index 5984e9f0..7b0017a6 100644 --- a/filters.cpp +++ b/filters.cpp @@ -4,7 +4,7 @@ #include "config.h"
#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100 4189)
+# pragma warning(disable: 4100 4189 4355)
#endif
#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
@@ -10,7 +10,7 @@ #if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 4127 4189 4514)
+# pragma warning(disable: 4127 4189 4231 4275 4514)
#endif
#include "cryptlib.h"
@@ -14,6 +14,11 @@ #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)
@@ -375,4 +380,8 @@ template<> inline void swap(CryptoPP::PolynomialMod2 &a, CryptoPP::PolynomialMod NAMESPACE_END
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -12,7 +12,7 @@ #if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 4189)
+# pragma warning(disable: 4189 4231 4275)
#endif
#include "cryptlib.h"
@@ -1,3 +1,5 @@ +// strciphr.h - originally written and placed in the public domain by Wei Dai
+
#ifndef CRYPTOPP_ITERHASH_H
#define CRYPTOPP_ITERHASH_H
@@ -6,6 +8,14 @@ #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
@@ -179,4 +189,8 @@ protected: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -14,6 +14,11 @@ #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>;
@@ -313,4 +318,8 @@ private: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
@@ -20,6 +20,14 @@ # 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
@@ -475,6 +483,10 @@ 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
@@ -9,6 +9,11 @@ #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>;
@@ -36,4 +41,8 @@ private: NAMESPACE_END
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(pop)
+#endif
+
#endif
diff --git a/regtest1.cpp b/regtest1.cpp index c4eb7380..86780e69 100644 --- a/regtest1.cpp +++ b/regtest1.cpp @@ -34,6 +34,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
USING_NAMESPACE(CryptoPP)
// Unkeyed ciphers
diff --git a/regtest2.cpp b/regtest2.cpp index d7a1d58c..8779c113 100644 --- a/regtest2.cpp +++ b/regtest2.cpp @@ -61,6 +61,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
USING_NAMESPACE(CryptoPP)
// Shared key ciphers
diff --git a/regtest3.cpp b/regtest3.cpp index 292bd544..7949c846 100644 --- a/regtest3.cpp +++ b/regtest3.cpp @@ -26,6 +26,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
USING_NAMESPACE(CryptoPP)
void RegisterFactories3()
@@ -12,9 +12,9 @@ #if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 4700)
+# pragma warning(disable: 4231 4275 4700)
# if (CRYPTOPP_MSC_VERSION >= 1400)
-# pragma warning(disable: 6386)
+# pragma warning(disable: 6011 6386 28193)
# endif
#endif
@@ -32,7 +32,7 @@ #if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 4127 4189)
+# pragma warning(disable: 4127 4189 4231 4275)
#endif
#include "cryptlib.h"
diff --git a/validat0.cpp b/validat0.cpp index a0aa9e61..4b482c03 100644 --- a/validat0.cpp +++ b/validat0.cpp @@ -31,6 +31,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test)
diff --git a/validat1.cpp b/validat1.cpp index 50d6911d..c10efdf4 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -64,6 +64,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test)
diff --git a/validat2.cpp b/validat2.cpp index cc505edd..3d984e92 100644 --- a/validat2.cpp +++ b/validat2.cpp @@ -51,6 +51,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test)
diff --git a/validat3.cpp b/validat3.cpp index 829840b0..81257ec8 100644 --- a/validat3.cpp +++ b/validat3.cpp @@ -44,6 +44,10 @@ # pragma strict_gs_check (on)
#endif
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4505 4355)
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test)
|