shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2024-11-23 09:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup warnings under MSC

Browse Source
This commit is contained in:
Jeffrey Walton 2018-01-21 16:25:49 -05:00
parent d6cf3b5020
commit 1df1d25428
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
algparam.h
View File

@ -1,7 +1,6 @@
// algparam.h - originally written and placed in the public domain by Wei Dai // algparam.h - originally written and placed in the public domain by Wei Dai
/// \file /// \file algparam.h
/// \headerfile algparam.h
/// \brief Classes for working with NameValuePairs /// \brief Classes for working with NameValuePairs
@ -11,14 +10,6 @@
#include "config.h" #include "config.h"
#include "cryptlib.h" #include "cryptlib.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
#include "smartptr.h" #include "smartptr.h"
#include "secblock.h" #include "secblock.h"
#include "integer.h" #include "integer.h"
@ -516,11 +507,6 @@ AlgorithmParameters MakeParameters(const char *name, const T &value, bool throwI
#define CRYPTOPP_SET_FUNCTION_ENTRY(name) (Name::name(), &ThisClass::Set##name) #define CRYPTOPP_SET_FUNCTION_ENTRY(name) (Name::name(), &ThisClass::Set##name)
#define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2) (Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2) #define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2) (Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2)
// TODO: fix 6011 when the API/ABI can change
#if (CRYPTOPP_MSC_VERSION >= 1400)
# pragma warning(pop)
#endif
NAMESPACE_END NAMESPACE_END
#endif #endif

1
mqv.cpp
View File

@ -3,6 +3,7 @@
// FHMQV provided by Uri Blumenthal. // FHMQV provided by Uri Blumenthal.
#include "pch.h" #include "pch.h"
#include "config.h"
#include "mqv.h" #include "mqv.h"
#include "hmqv.h" #include "hmqv.h"
#include "fhmqv.h" #include "fhmqv.h"

4
padlkrng.cpp
View File

@ -11,6 +11,10 @@
// find copies of the Programmer's manual, Cryptography Research Inc audit // find copies of the Programmer's manual, Cryptography Research Inc audit
// report, and other goodies at http://www.cryptopp.com/wiki/VIA_Padlock. // report, and other goodies at http://www.cryptopp.com/wiki/VIA_Padlock.
#if CRYPTOPP_MSC_VERSION
# pragma warning(disable: 4702)
#endif
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
PadlockRNG::PadlockRNG(word32 divisor) PadlockRNG::PadlockRNG(word32 divisor)

8
validat4.cpp
View File

@ -32,7 +32,7 @@
#endif #endif
#if CRYPTOPP_MSC_VERSION #if CRYPTOPP_MSC_VERSION
# pragma warning(disable: 4505 4355) # pragma warning(disable: 4610 4510 4505 4355)
#endif #endif
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
@ -425,7 +425,7 @@ bool TestCryptoSign()
uint64_t s = STDMIN(smlen, (uint64_t)crypto_sign_BYTES); uint64_t s = STDMIN(smlen, (uint64_t)crypto_sign_BYTES);
pass = (s >= crypto_sign_BYTES) && pass; pass = (s >= crypto_sign_BYTES) && pass;
fail = std::memcmp(sm, data.sig, s) != 0; fail = std::memcmp(sm, data.sig, (size_t)s) != 0;
pass = !fail && pass; pass = !fail && pass;
uint64_t rmlen; uint64_t rmlen;
@ -433,7 +433,7 @@ bool TestCryptoSign()
fail = (rc != 0); pass = !fail && pass; fail = (rc != 0); pass = !fail && pass;
pass = (l == rmlen) && pass; pass = (l == rmlen) && pass;
fail = std::memcmp(m, rm, STDMIN(l, rmlen)) != 0; fail = std::memcmp(m, rm, (size_t)STDMIN(l, rmlen)) != 0;
pass = !fail && pass; pass = !fail && pass;
} }
@ -470,7 +470,7 @@ bool TestCryptoSignKeys()
if(mlen && rmlen) if(mlen && rmlen)
{ {
pass = (mlen == rmlen) && pass; pass = (mlen == rmlen) && pass;
fail = std::memcmp(m, rm, STDMIN(mlen, rmlen)) != 0; fail = std::memcmp(m, rm, (size_t)STDMIN(mlen, rmlen)) != 0;
pass = !fail && pass; pass = !fail && pass;
} }