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

Backed-off assert for poly1305.cpp in Debug builds

pull/347/head
Jeffrey Walton 2016-12-01 21:52:01 -05:00
parent d91244a657
commit 406bec8fc7
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
poly1305.cpp
View File

@ -15,7 +15,7 @@ NAMESPACE_BEGIN(CryptoPP)
template <class T> template <class T>
void Poly1305_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params) void Poly1305_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
{ {
if(key && length) if (key && length)
{ {
// key is {k,r} pair, r is 16 bytes // key is {k,r} pair, r is 16 bytes
length = SaturatingSubtract(length, (unsigned)BLOCKSIZE); length = SaturatingSubtract(length, (unsigned)BLOCKSIZE);
@ -32,7 +32,7 @@ void Poly1305_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, con
} }
ConstByteArrayParameter t; ConstByteArrayParameter t;
if(params.GetValue(Name::IV(), t) && t.begin() && t.size()) if (params.GetValue(Name::IV(), t) && t.begin() && t.size())
{ {
SecByteBlock nk(16); SecByteBlock nk(16);
m_cipher.ProcessBlock(t.begin(), nk); m_cipher.ProcessBlock(t.begin(), nk);
@ -51,7 +51,8 @@ void Poly1305_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, con
template <class T> template <class T>
void Poly1305_Base<T>::Update(const byte *input, size_t length) void Poly1305_Base<T>::Update(const byte *input, size_t length)
{ {
CRYPTOPP_ASSERT((input && length) || !(input || length)); CRYPTOPP_ASSERT((input && length) || !length);
if (!length) return;
size_t rem, num = m_idx; size_t rem, num = m_idx;
if (num) if (num)