feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fixes to avoid declaring any variables mid-function and always initializing.

Browse Source
This commit is contained in:
David Garske
2019-12-31 11:43:13 -08:00
parent 784d95afbe
commit 01c7cc6502
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wolfcrypt/src/chacha20_poly1305.c
View File

@ -329,13 +329,16 @@ int wc_ChaCha20Poly1305_UpdateAad(ChaChaPoly_Aead* aead,
static int wc_ChaCha20Poly1305_CalcAad(ChaChaPoly_Aead* aead) static int wc_ChaCha20Poly1305_CalcAad(ChaChaPoly_Aead* aead)
{ {
/* Pad the AAD to 16 bytes */
int ret = 0; int ret = 0;
word32 paddingLen;
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1]; byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
word32 paddingLen = -(int)aead->aadLen &
XMEMSET(padding, 0, sizeof(padding));
/* Pad the AAD to 16 bytes */
paddingLen = -(int)aead->aadLen &
(CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1); (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if (paddingLen > 0) { if (paddingLen > 0) {
XMEMSET(padding, 0, paddingLen);
ret = wc_Poly1305Update(&aead->poly, padding, paddingLen); ret = wc_Poly1305Update(&aead->poly, padding, paddingLen);
} }
return ret; return ret;
@ -386,6 +389,9 @@ int wc_ChaCha20Poly1305_Final(ChaChaPoly_Aead* aead,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]) byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE])
{ {
int ret = 0; int ret = 0;
word32 paddingLen;
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
byte little64[16]; /* word64 * 2 */
if (aead == NULL || outAuthTag == NULL) { if (aead == NULL || outAuthTag == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -395,6 +401,9 @@ int wc_ChaCha20Poly1305_Final(ChaChaPoly_Aead* aead,
return BAD_STATE_E; return BAD_STATE_E;
} }
XMEMSET(padding, 0, sizeof(padding));
XMEMSET(little64, 0, sizeof(little64));
/* make sure AAD is calculated */ /* make sure AAD is calculated */
if (aead->state == CHACHA20_POLY1305_STATE_AAD) { if (aead->state == CHACHA20_POLY1305_STATE_AAD) {
ret = wc_ChaCha20Poly1305_CalcAad(aead); ret = wc_ChaCha20Poly1305_CalcAad(aead);
@ -402,18 +411,15 @@ int wc_ChaCha20Poly1305_Final(ChaChaPoly_Aead* aead,
/* Pad the ciphertext to 16 bytes */ /* Pad the ciphertext to 16 bytes */
if (ret == 0) { if (ret == 0) {
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1]; paddingLen = -(int)aead->dataLen &
word32 paddingLen = -(int)aead->dataLen &
(CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1); (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if (paddingLen > 0) { if (paddingLen > 0) {
XMEMSET(padding, 0, paddingLen);
ret = wc_Poly1305Update(&aead->poly, padding, paddingLen); ret = wc_Poly1305Update(&aead->poly, padding, paddingLen);
} }
} }
/* Add the aad and ciphertext length */ /* Add the aad and ciphertext length */
if (ret == 0) { if (ret == 0) {
byte little64[16]; /* word64 * 2 */
/* AAD length as a 64-bit little endian integer */ /* AAD length as a 64-bit little endian integer */
word32ToLittle64(aead->aadLen, little64); word32ToLittle64(aead->aadLen, little64);
/* Ciphertext length as a 64-bit little endian integer */ /* Ciphertext length as a 64-bit little endian integer */