taigrr/arduinolibs
1
0
Fork 0
mirror of https://github.com/taigrr/arduinolibs synced 2025-01-18 04:33:12 -08:00
Code Issues Projects Releases Wiki Activity

GCM: Fix test cases where the IV is not 96 bits in size

Browse Source
This commit is contained in:
Rhys Weatherley 2018-04-15 13:27:34 +10:00
parent 7868671873
commit 0189fdeee8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/Crypto/GCM.cpp
View File

@ -77,9 +77,7 @@ size_t GCMCommon::tagSize() const
bool GCMCommon::setKey(const uint8_t *key, size_t len) bool GCMCommon::setKey(const uint8_t *key, size_t len)
{ {
// Set the encryption key for the block cipher. // Set the encryption key for the block cipher.
if (!blockCipher->setKey(key, len)) return blockCipher->setKey(key, len);
return false;
return true;
} }
bool GCMCommon::setIV(const uint8_t *iv, size_t len) bool GCMCommon::setIV(const uint8_t *iv, size_t len)
@ -94,6 +92,9 @@ bool GCMCommon::setIV(const uint8_t *iv, size_t len)
state.counter[15] = 1; state.counter[15] = 1;
} else { } else {
// IV's of other sizes are hashed to produce the counter block. // IV's of other sizes are hashed to produce the counter block.
memset(state.nonce, 0, 16);
blockCipher->encryptBlock(state.nonce, state.nonce);
ghash.reset(state.nonce);
ghash.update(iv, len); ghash.update(iv, len);
ghash.pad(); ghash.pad();
uint64_t sizes[2] = {0, htobe64(((uint64_t)len) * 8)}; uint64_t sizes[2] = {0, htobe64(((uint64_t)len) * 8)};