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

Clear conversion wanrings under MSVC

pull/709/head
Jeffrey Walton 2018-08-20 10:44:36 -04:00
parent c24f17b7a2
commit c25a1e354d
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
simon.cpp
View File

@ -99,7 +99,8 @@ inline void SIMON64_ExpandKey_3W(word32 key[42], const word32 k[3])
key[0] = k[2]; key[1] = k[1]; key[2] = k[0]; key[0] = k[2]; key[1] = k[1]; key[2] = k[0];
for (size_t i = 3; i<42; ++i) for (size_t i = 3; i<42; ++i)
{ {
key[i] = c ^ (z & 1) ^ key[i - 3] ^ rotrConstant<3>(key[i - 1]) ^ rotrConstant<4>(key[i - 1]); key[i] = static_cast<word32>(c ^ (z & 1) ^ key[i - 3] ^
rotrConstant<3>(key[i - 1]) ^ rotrConstant<4>(key[i - 1]));
z >>= 1; z >>= 1;
} }
} }
@ -117,7 +118,9 @@ inline void SIMON64_ExpandKey_4W(word32 key[44], const word32 k[4])
key[0] = k[3]; key[1] = k[2]; key[2] = k[1]; key[3] = k[0]; key[0] = k[3]; key[1] = k[2]; key[2] = k[1]; key[3] = k[0];
for (size_t i = 4; i<44; ++i) for (size_t i = 4; i<44; ++i)
{ {
key[i] = c ^ (z & 1) ^ key[i - 4] ^ rotrConstant<3>(key[i - 1]) ^ key[i - 3] ^ rotrConstant<4>(key[i - 1]) ^ rotrConstant<1>(key[i - 3]); key[i] = static_cast<word32>(c ^ (z & 1) ^ key[i - 4] ^
rotrConstant<3>(key[i - 1]) ^ key[i - 3] ^ rotrConstant<4>(key[i - 1]) ^
rotrConstant<1>(key[i - 3]));
z >>= 1; z >>= 1;
} }
} }