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

Improved state handling.

Browse Source
This commit is contained in:
David Garske
2019-12-31 10:34:06 -08:00
parent bff6dcec24
commit 784d95afbe
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wolfcrypt/src/chacha20_poly1305.c
View File

@@ -329,22 +329,14 @@ 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;
if (aead == NULL) { byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
return BAD_FUNC_ARG; word32 paddingLen = -(int)aead->aadLen &
} (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if (aead->state == CHACHA20_POLY1305_STATE_AAD) { if (paddingLen > 0) {
/* Pad the AAD to 16 bytes */ XMEMSET(padding, 0, paddingLen);
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1]; ret = wc_Poly1305Update(&aead->poly, padding, paddingLen);
word32 paddingLen = -(int)aead->aadLen &
(CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if (paddingLen > 0) {
XMEMSET(padding, 0, paddingLen);
ret = wc_Poly1305Update(&aead->poly, padding, paddingLen);
}
/* advance state */
aead->state = CHACHA20_POLY1305_STATE_DATA;
} }
return ret; return ret;
} }
@@ -364,7 +356,12 @@ int wc_ChaCha20Poly1305_UpdateData(ChaChaPoly_Aead* aead,
} }
/* calculate AAD */ /* calculate AAD */
ret = wc_ChaCha20Poly1305_CalcAad(aead); if (aead->state == CHACHA20_POLY1305_STATE_AAD) {
ret = wc_ChaCha20Poly1305_CalcAad(aead);
}
/* advance state */
aead->state = CHACHA20_POLY1305_STATE_DATA;
if (ret == 0) { if (ret == 0) {
/* Perform ChaCha20 encrypt or decrypt inline and Poly1305 auth calc */ /* Perform ChaCha20 encrypt or decrypt inline and Poly1305 auth calc */
@@ -393,12 +390,14 @@ int wc_ChaCha20Poly1305_Final(ChaChaPoly_Aead* aead,
if (aead == NULL || outAuthTag == NULL) { if (aead == NULL || outAuthTag == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (aead->state != CHACHA20_POLY1305_STATE_AAD &&
aead->state != CHACHA20_POLY1305_STATE_DATA) {
return BAD_STATE_E;
}
/* make sure AAD is calculated */ /* make sure AAD is calculated */
ret = wc_ChaCha20Poly1305_CalcAad(aead); if (aead->state == CHACHA20_POLY1305_STATE_AAD) {
ret = wc_ChaCha20Poly1305_CalcAad(aead);
if (aead->state != CHACHA20_POLY1305_STATE_DATA) {
return BAD_STATE_E;
} }
/* Pad the ciphertext to 16 bytes */ /* Pad the ciphertext to 16 bytes */