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

Clear warnings under GCC with -Wall -Wextra

pull/489/head
Jeffrey Walton 2017-09-05 12:23:12 -04:00
parent b0f3b8ce17
commit 23b939c62b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
validat1.cpp
View File

@ -1909,8 +1909,10 @@ public:
template <class E, class D> class FixedRoundsCipherFactory : public CipherFactory template <class E, class D> class FixedRoundsCipherFactory : public CipherFactory
{ {
public: public:
FixedRoundsCipherFactory(unsigned int keylen=0) : m_keylen(keylen?keylen:E::DEFAULT_KEYLENGTH) {} FixedRoundsCipherFactory(unsigned int keylen=0) :
unsigned int BlockSize() const {return E::BLOCKSIZE;} m_keylen(keylen ? keylen : static_cast<unsigned int>(E::DEFAULT_KEYLENGTH)) {}
unsigned int BlockSize() const {return static_cast<unsigned int>(E::BLOCKSIZE);}
unsigned int KeyLength() const {return m_keylen;} unsigned int KeyLength() const {return m_keylen;}
BlockTransformation* NewEncryption(const byte *keyStr) const BlockTransformation* NewEncryption(const byte *keyStr) const
@ -1924,9 +1926,11 @@ public:
template <class E, class D> class VariableRoundsCipherFactory : public CipherFactory template <class E, class D> class VariableRoundsCipherFactory : public CipherFactory
{ {
public: public:
VariableRoundsCipherFactory(unsigned int keylen=0, unsigned int rounds=0) VariableRoundsCipherFactory(unsigned int keylen=0, unsigned int rounds=0) :
: m_keylen(keylen ? keylen : E::DEFAULT_KEYLENGTH), m_rounds(rounds ? rounds : E::DEFAULT_ROUNDS) {} m_keylen(keylen ? keylen : static_cast<unsigned int>(E::DEFAULT_KEYLENGTH)),
unsigned int BlockSize() const {return E::BLOCKSIZE;} m_rounds(rounds ? rounds : static_cast<unsigned int>(E::DEFAULT_ROUNDS)) {}
unsigned int BlockSize() const {return static_cast<unsigned int>(E::BLOCKSIZE);}
unsigned int KeyLength() const {return m_keylen;} unsigned int KeyLength() const {return m_keylen;}
BlockTransformation* NewEncryption(const byte *keyStr) const BlockTransformation* NewEncryption(const byte *keyStr) const