nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

crypto/ice: fix key length assertion

Browse Source
This commit is contained in:
Danny Robson 2016-06-30 18:21:21 +10:00
parent 2e700e6444
commit 62482594bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/ice.cpp
View File

@ -392,11 +392,11 @@ ice::scheduleBuild (std::array<uint16_t,4> &kb,
void void
ice::set (const uint64_t *_key_first, const uint64_t *_key_last) ice::set (const uint64_t *_key_first, const uint64_t *_key_last)
{ {
CHECK_EQ ((unsigned)(_key_last - _key_first), m_size);
auto key = reinterpret_cast<const uint8_t*> (_key_first); auto key = reinterpret_cast<const uint8_t*> (_key_first);
if (m_rounds == 8) { if (m_rounds == 8) {
CHECK_EQ (_key_last - _key_first, 8 * 2 + 1);
std::array<uint16_t,4> kb; std::array<uint16_t,4> kb;
for (unsigned i = 0; i < 4; i++) for (unsigned i = 0; i < 4; i++)
@ -407,8 +407,6 @@ ice::set (const uint64_t *_key_first, const uint64_t *_key_last)
} }
for (unsigned i = 0; i < m_size; i++) { for (unsigned i = 0; i < m_size; i++) {
CHECK_EQ ((unsigned)(_key_last - _key_first), m_size * 8u + 4u * 2u + 1u);
std::array<uint16_t,4> kb; std::array<uint16_t,4> kb;
for (unsigned j = 0; j < 4; j++) for (unsigned j = 0; j < 4; j++)