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

Cleared warning 'Warning: personalization hides CryptoPP::BLAKE2_ParameterBlock<0>::personalization'

pull/186/head
Jeffrey Walton 2016-06-08 17:49:43 -04:00
parent bc52b1abf8
commit 4431bc58e5
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
blake2.cpp
View File

@ -187,74 +187,74 @@ pfnCompress32 InitializeCompress32Fn()
#endif // CRYPTOPP_DOXYGEN_PROCESSING #endif // CRYPTOPP_DOXYGEN_PROCESSING
BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen, BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
const byte* salt, size_t saltLen, const byte* saltStr, size_t saltLen,
const byte* personalization, size_t personalizationLen) const byte* personalizationStr, size_t personalizationLen)
{ {
static const size_t head = sizeof(*this) - sizeof(this->personalization) - sizeof(this->salt); static const size_t head = sizeof(*this) - sizeof(personalization) - sizeof(salt);
memset(this, 0x00, head); memset(this, 0x00, head);
this->digestLength = (byte)digestLen; digestLength = (byte)digestLen;
this->keyLength = (byte)keyLen; keyLength = (byte)keyLen;
fanout = depth = 1; fanout = depth = 1;
if (salt && saltLen) if (saltStr && saltLen)
{ {
memcpy_s(this->salt, sizeof(this->salt), salt, saltLen); memcpy_s(salt, sizeof(salt), saltStr, saltLen);
const size_t rem = sizeof(this->salt) - saltLen; const size_t rem = sizeof(salt) - saltLen;
if (rem) if (rem)
memset(this->salt+rem, 0x00, rem); memset(salt+rem, 0x00, rem);
} }
else else
{ {
memset(this->salt, 0x00, sizeof(this->salt)); memset(salt, 0x00, sizeof(salt));
} }
if (personalization && personalizationLen) if (personalizationStr && personalizationLen)
{ {
memcpy_s(this->personalization, sizeof(this->personalization), personalization, personalizationLen); memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen);
const size_t rem = sizeof(this->personalization) - personalizationLen; const size_t rem = sizeof(personalization) - personalizationLen;
if (rem) if (rem)
memset(this->personalization+rem, 0x00, rem); memset(personalization+rem, 0x00, rem);
} }
else else
{ {
memset(this->personalization, 0x00, sizeof(this->personalization)); memset(personalization, 0x00, sizeof(personalization));
} }
} }
BLAKE2_ParameterBlock<true>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen, BLAKE2_ParameterBlock<true>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
const byte* salt, size_t saltLen, const byte* saltStr, size_t saltLen,
const byte* personalization, size_t personalizationLen) const byte* personalizationStr, size_t personalizationLen)
{ {
static const size_t head = sizeof(*this) - sizeof(this->personalization) - sizeof(this->salt); static const size_t head = sizeof(*this) - sizeof(personalization) - sizeof(salt);
memset(this, 0x00, head); memset(this, 0x00, head);
this->digestLength = (byte)digestLen; digestLength = (byte)digestLen;
this->keyLength = (byte)keyLen; keyLength = (byte)keyLen;
fanout = depth = 1; fanout = depth = 1;
if (salt && saltLen) if (saltStr && saltLen)
{ {
memcpy_s(this->salt, sizeof(this->salt), salt, saltLen); memcpy_s(salt, sizeof(salt), saltStr, saltLen);
const size_t rem = sizeof(this->salt) - saltLen; const size_t rem = sizeof(salt) - saltLen;
if (rem) if (rem)
memset(this->salt+rem, 0x00, rem); memset(salt+rem, 0x00, rem);
} }
else else
{ {
memset(this->salt, 0x00, sizeof(this->salt)); memset(salt, 0x00, sizeof(salt));
} }
if (personalization && personalizationLen) if (personalizationStr && personalizationLen)
{ {
memcpy_s(this->personalization, sizeof(this->personalization), personalization, personalizationLen); memcpy_s(personalization, sizeof(personalization), personalizationStr, personalizationLen);
const size_t rem = sizeof(this->personalization) - personalizationLen; const size_t rem = sizeof(personalization) - personalizationLen;
if (rem) if (rem)
memset(this->personalization+rem, 0x00, rem); memset(personalization+rem, 0x00, rem);
} }
else else
{ {
memset(this->personalization, 0x00, sizeof(this->personalization)); memset(personalization, 0x00, sizeof(personalization));
} }
} }