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

Merge pull request #254 from Blacktempel/patch-2 

Update seckey.h
pull/253/merge
Jeffrey Walton 2016-09-05 01:13:30 -04:00 committed by GitHub
parent 6df846ffec 262d125fb2
commit 50c276bda7
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
seckey.h
View File

@ -80,16 +80,16 @@ protected:
//! \throws InvalidRounds if the number of rounds are invalid //! \throws InvalidRounds if the number of rounds are invalid
inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg) inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg)
{ {
#if defined(__BORLANDC__) if (M == INT_MAX) // Coverity and result_independent_of_operands
if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS) {
throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds); if (rounds < MIN_ROUNDS)
#elif (M==INT_MAX) // Coverity and result_independent_of_operands throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
if (rounds < MIN_ROUNDS) }
throw InvalidRounds(alg ? alg->AlgorithmName() : "VariableRounds", rounds); else
#else {
if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS) if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS)
throw InvalidRounds(alg ? alg->AlgorithmName() : "VariableRounds", rounds); throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
#endif }
} }
//! \brief Validates the number of rounds for an algorithm //! \brief Validates the number of rounds for an algorithm
@ -194,12 +194,9 @@ public:
//! \details keylength is provided in bytes, not bits. //! \details keylength is provided in bytes, not bits.
static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength) static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
{ {
#if MIN_KEYLENGTH > 0
if (keylength < (size_t)MIN_KEYLENGTH) if (keylength < (size_t)MIN_KEYLENGTH)
return MIN_KEYLENGTH; return MIN_KEYLENGTH;
else else if (keylength > (size_t)MAX_KEYLENGTH)
#endif
if (keylength > (size_t)MAX_KEYLENGTH)
return (size_t)MAX_KEYLENGTH; return (size_t)MAX_KEYLENGTH;
else else
{ {