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

Revert "Rewrite 'keylength < MIN_KEYLENGTH' to avoid -Wtautological-compare" 

This reverts commit 08a206f3eb. This broke the self tests, and casting everything to 'signed int' to avoid unsigned promots did not resolve the issue.
pull/301/head
Jeffrey Walton 2016-09-21 13:47:47 -04:00
parent 08a206f3eb
commit 1de8ca5774
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
seckey.h
View File

@ -215,8 +215,7 @@ public:
// TODO: Figure out how to make this CRYPTOPP_CONSTEXPR // TODO: Figure out how to make this CRYPTOPP_CONSTEXPR
static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength) static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
{ {
// Rewrite 'keylength < MIN_KEYLENGTH' to avoid -Wtautological-compare if (keylength < (size_t)MIN_KEYLENGTH)
if ((int)keylength - MIN_KEYLENGTH < 0)
return MIN_KEYLENGTH; return MIN_KEYLENGTH;
else if (keylength > (size_t)MAX_KEYLENGTH) else if (keylength > (size_t)MAX_KEYLENGTH)
return (size_t)MAX_KEYLENGTH; return (size_t)MAX_KEYLENGTH;