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

Use COUNTOF and offset consistently

pull/211/head
Jeffrey Walton 2016-07-01 00:47:47 -04:00
parent 0d28f5b6b5
commit 4c6833e706
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
blake2.cpp
View File

@ -208,26 +208,28 @@ BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t key
if (saltStr && saltLen) if (saltStr && saltLen)
{ {
memcpy_s(salt, sizeof(salt), saltStr, saltLen); memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
const size_t rem = sizeof(salt) - saltLen; const size_t rem = COUNTOF(salt) - saltLen;
const size_t off = COUNTOF(salt) - rem;
if (rem) if (rem)
memset(salt+rem, 0x00, rem); memset(&salt[off], 0x00, rem);
} }
else else
{ {
memset(salt, 0x00, sizeof(salt)); memset(salt, 0x00, COUNTOF(salt));
} }
if (personalizationStr && personalizationLen) if (personalizationStr && personalizationLen)
{ {
memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen); memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
const size_t rem = sizeof(personalization) - personalizationLen; const size_t rem = COUNTOF(personalization) - personalizationLen;
const size_t off = COUNTOF(personalization) - rem;
if (rem) if (rem)
memset(personalization+rem, 0x00, rem); memset(&personalization[off], 0x00, rem);
} }
else else
{ {
memset(personalization, 0x00, sizeof(personalization)); memset(personalization, 0x00, COUNTOF(personalization));
} }
} }
@ -244,26 +246,28 @@ BLAKE2_ParameterBlock<true>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyL
if (saltStr && saltLen) if (saltStr && saltLen)
{ {
memcpy_s(salt, sizeof(salt), saltStr, saltLen); memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
const size_t rem = sizeof(salt) - saltLen; const size_t rem = COUNTOF(salt) - saltLen;
const size_t off = COUNTOF(salt) - rem;
if (rem) if (rem)
memset(salt+rem, 0x00, rem); memset(&salt[off], 0x00, rem);
} }
else else
{ {
memset(salt, 0x00, sizeof(salt)); memset(salt, 0x00, COUNTOF(salt));
} }
if (personalizationStr && personalizationLen) if (personalizationStr && personalizationLen)
{ {
memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen); memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
const size_t rem = sizeof(personalization) - personalizationLen; const size_t rem = COUNTOF(personalization) - personalizationLen;
const size_t off = COUNTOF(personalization) - rem;
if (rem) if (rem)
memset(personalization+rem, 0x00, rem); memset(&personalization[off], 0x00, rem);
} }
else else
{ {
memset(personalization, 0x00, sizeof(personalization)); memset(personalization, 0x00, COUNTOF(personalization));
} }
} }