arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Miscellaneos warning fixes (GH #739) 

* Fix -pedantic warning in GCC.

* Fix -Wunused-private-field warning.

* Fix -Wkeyword-macro warning.
pull/748/head
bobsayshilol 2018-11-14 03:04:03 +00:00 committed by Jeffrey Walton
parent fc1e98e70d
commit 7f8d3e8882
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
des.cpp
View File

@ -284,14 +284,16 @@ namespace {
void RawDES::RawSetKey(CipherDir dir, const byte *key) void RawDES::RawSetKey(CipherDir dir, const byte *key)
{ {
#if (_MSC_VER >= 1600) || (__cplusplus >= 201103L) #if (_MSC_VER >= 1600) || (__cplusplus >= 201103L)
# define register /* Define to nothing for C++11 and above */ # define REGISTER /* Define to nothing for C++11 and above */
#else
# define REGISTER register
#endif #endif
SecByteBlock buffer(56+56+8); SecByteBlock buffer(56+56+8);
byte *const pc1m=buffer; /* place to modify pc1 into */ byte *const pc1m=buffer; /* place to modify pc1 into */
byte *const pcr=pc1m+56; /* place to rotate pc1 into */ byte *const pcr=pc1m+56; /* place to rotate pc1 into */
byte *const ks=pcr+56; byte *const ks=pcr+56;
register int i,j,l; REGISTER int i,j,l;
int m; int m;
for (j=0; j<56; j++) { /* convert pc1 to bits of key */ for (j=0; j<56; j++) { /* convert pc1 to bits of key */

2
filters.h
View File

@ -1100,7 +1100,7 @@ CRYPTOPP_DLL_TEMPLATE_CLASS StringSinkTemplate<std::string>;
/// \brief Append input to a std::vector<byte> object /// \brief Append input to a std::vector<byte> object
/// \details VectorSink is a typedef for StringSinkTemplate<std::vector<byte> >. /// \details VectorSink is a typedef for StringSinkTemplate<std::vector<byte> >.
DOCUMENTED_TYPEDEF(StringSinkTemplate<std::vector<byte> >, VectorSink); DOCUMENTED_TYPEDEF(StringSinkTemplate<std::vector<byte> >, VectorSink)
CRYPTOPP_DLL_TEMPLATE_CLASS StringSinkTemplate<std::vector<byte> >; CRYPTOPP_DLL_TEMPLATE_CLASS StringSinkTemplate<std::vector<byte> >;
/// \brief Incorporates input into RNG as additional entropy /// \brief Incorporates input into RNG as additional entropy

4
gf2n.h
View File

@ -357,13 +357,13 @@ class CRYPTOPP_DLL GF2NPP : public GF2NP
public: public:
// polynomial modulus = x^t0 + x^t1 + x^t2 + x^t3 + x^t4, t0 > t1 > t2 > t3 > t4 // polynomial modulus = x^t0 + x^t1 + x^t2 + x^t3 + x^t4, t0 > t1 > t2 > t3 > t4
GF2NPP(unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4) GF2NPP(unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4)
: GF2NP(PolynomialMod2::Pentanomial(t0, t1, t2, t3, t4)), t0(t0), t1(t1), t2(t2), t3(t3) {} : GF2NP(PolynomialMod2::Pentanomial(t0, t1, t2, t3, t4)), t1(t1), t2(t2), t3(t3) {}
GF2NP * Clone() const {return new GF2NPP(*this);} GF2NP * Clone() const {return new GF2NPP(*this);}
void DEREncode(BufferedTransformation &bt) const; void DEREncode(BufferedTransformation &bt) const;
private: private:
unsigned int t0, t1, t2, t3; unsigned int t1, t2, t3;
}; };
// construct new GF2NP from the ASN.1 sequence Characteristic-two // construct new GF2NP from the ASN.1 sequence Characteristic-two