diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-07-01 00:47:47 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-07-01 00:47:47 -0400 |
| commit | 4c6833e706c68dfe69b51fd6f9d52320dae87d4d (patch) | |
| tree | 579c1192c55fb9741fc039a77d3fda11cd944c5c /blake2.cpp | |
| parent | 0d28f5b6b58db2fff5f68c1db7a04562c0407c2e (diff) | |
| download | cryptopp-git-4c6833e706c68dfe69b51fd6f9d52320dae87d4d.tar.gz | |
Use COUNTOF and offset consistently
Diffstat (limited to 'blake2.cpp')
| -rw-r--r-- | blake2.cpp | 36 |
1 files changed, 20 insertions, 16 deletions
@@ -208,26 +208,28 @@ BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t key if (saltStr && saltLen)
{
- memcpy_s(salt, sizeof(salt), saltStr, saltLen);
- const size_t rem = sizeof(salt) - saltLen;
+ memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
+ const size_t rem = COUNTOF(salt) - saltLen;
+ const size_t off = COUNTOF(salt) - rem;
if (rem)
- memset(salt+rem, 0x00, rem);
+ memset(&salt[off], 0x00, rem);
}
else
{
- memset(salt, 0x00, sizeof(salt));
+ memset(salt, 0x00, COUNTOF(salt));
}
if (personalizationStr && personalizationLen)
{
- memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen);
- const size_t rem = sizeof(personalization) - personalizationLen;
+ memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
+ const size_t rem = COUNTOF(personalization) - personalizationLen;
+ const size_t off = COUNTOF(personalization) - rem;
if (rem)
- memset(personalization+rem, 0x00, rem);
+ memset(&personalization[off], 0x00, rem);
}
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)
{
- memcpy_s(salt, sizeof(salt), saltStr, saltLen);
- const size_t rem = sizeof(salt) - saltLen;
+ memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
+ const size_t rem = COUNTOF(salt) - saltLen;
+ const size_t off = COUNTOF(salt) - rem;
if (rem)
- memset(salt+rem, 0x00, rem);
+ memset(&salt[off], 0x00, rem);
}
else
{
- memset(salt, 0x00, sizeof(salt));
+ memset(salt, 0x00, COUNTOF(salt));
}
if (personalizationStr && personalizationLen)
{
- memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen);
- const size_t rem = sizeof(personalization) - personalizationLen;
+ memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
+ const size_t rem = COUNTOF(personalization) - personalizationLen;
+ const size_t off = COUNTOF(personalization) - rem;
if (rem)
- memset(personalization+rem, 0x00, rem);
+ memset(&personalization[off], 0x00, rem);
}
else
{
- memset(personalization, 0x00, sizeof(personalization));
+ memset(personalization, 0x00, COUNTOF(personalization));
}
}
|