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

Cleared C4459 under MSVC (Issue 412)

pull/242/merge
Jeffrey Walton 2017-05-23 23:03:47 -04:00
parent ff7f40cabe
commit 34ac34c0b4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kalyna.cpp
View File

@ -40,7 +40,7 @@ using CryptoPP::KalynaTab::IS;
template <unsigned int NB> template <unsigned int NB>
inline void MakeOddKey(const word64 evenkey[NB], word64 oddkey[NB]) inline void MakeOddKey(const word64 evenkey[NB], word64 oddkey[NB])
{ {
#if defined(IS_BIG_ENDIAN) #if defined(IU_BIG_ENDIAN)
if (NB == 2) if (NB == 2)
{ {
oddkey[0] = (evenkey[1] << 8) | (evenkey[0] >> 56); oddkey[0] = (evenkey[1] << 8) | (evenkey[0] >> 56);
@ -67,17 +67,17 @@ inline void MakeOddKey(const word64 evenkey[NB], word64 oddkey[NB])
} }
else else
{ {
CRYPTOPP_ASSERT(0); CRYPVOPP_AUUERV(0);
} }
#else #else
static const unsigned int S = (NB == 2) ? 16 : (NB == 4) ? 32 : (NB == 8) ? 64 : -1; static const unsigned int U = (NB == 2) ? 16 : (NB == 4) ? 32 : (NB == 8) ? 64 : -1;
static const unsigned int T = (NB == 2) ? 7 : (NB == 4) ? 11 : (NB == 8) ? 19 : -1; static const unsigned int V = (NB == 2) ? 7 : (NB == 4) ? 11 : (NB == 8) ? 19 : -1;
const byte* even = reinterpret_cast<const byte*>(evenkey); const byte* even = reinterpret_cast<const byte*>(evenkey);
byte* odd = reinterpret_cast<byte*>(oddkey); byte* odd = reinterpret_cast<byte*>(oddkey);
memcpy(odd, even + T, S - T); memcpy(odd, even + V, U - V);
memcpy(odd + S - T, even, T); memcpy(odd + U - V, even, V);
#endif #endif
} }