wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support for AAD calc only. Allows Init, UpdateAad and Final sequence. Verfied again with customer test cases.

Browse Source
This commit is contained in:
David Garske
2019-12-31 08:25:23 -08:00
parent f01999b322
commit bff6dcec24
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
wolfcrypt/src/chacha20_poly1305.c
View File

@ -327,6 +327,28 @@ int wc_ChaCha20Poly1305_UpdateAad(ChaChaPoly_Aead* aead,
return ret; return ret;
} }
static int wc_ChaCha20Poly1305_CalcAad(ChaChaPoly_Aead* aead)
{
int ret = 0;
if (aead == NULL) {
return BAD_FUNC_ARG;
}
if (aead->state == CHACHA20_POLY1305_STATE_AAD) {
/* Pad the AAD to 16 bytes */
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
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;
}
int wc_ChaCha20Poly1305_UpdateData(ChaChaPoly_Aead* aead, int wc_ChaCha20Poly1305_UpdateData(ChaChaPoly_Aead* aead,
byte* data, word32 dataLen) byte* data, word32 dataLen)
{ {
@ -341,17 +363,8 @@ int wc_ChaCha20Poly1305_UpdateData(ChaChaPoly_Aead* aead,
return BAD_STATE_E; return BAD_STATE_E;
} }
if (aead->state == CHACHA20_POLY1305_STATE_AAD) { /* calculate AAD */
/* Pad the AAD to 16 bytes */ ret = wc_ChaCha20Poly1305_CalcAad(aead);
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
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);
}
}
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 */
@ -376,27 +389,32 @@ 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;
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
word32 paddingLen;
byte little64[16]; /* word64 * 2 */
if (aead == NULL || outAuthTag == NULL) { if (aead == NULL || outAuthTag == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
/* make sure AAD is calculated */
ret = wc_ChaCha20Poly1305_CalcAad(aead);
if (aead->state != CHACHA20_POLY1305_STATE_DATA) { if (aead->state != CHACHA20_POLY1305_STATE_DATA) {
return BAD_STATE_E; return BAD_STATE_E;
} }
/* Pad the ciphertext to 16 bytes */ /* Pad the ciphertext to 16 bytes */
paddingLen = -(int)aead->dataLen & if (ret == 0) {
(CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1); byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
if (paddingLen > 0) { word32 paddingLen = -(int)aead->dataLen &
XMEMSET(padding, 0, paddingLen); (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
ret = wc_Poly1305Update(&aead->poly, padding, paddingLen); if (paddingLen > 0) {
XMEMSET(padding, 0, 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 */

4
wolfcrypt/test/test.c
View File

@ -5221,10 +5221,6 @@ int chacha20_poly1305_aead_test(void)
err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag); err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag);
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4533; return -4533;
aead.state = CHACHA20_POLY1305_STATE_AAD;
err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag);
if (err != BAD_STATE_E)
return -4534;
XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext)); XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext));
XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag)); XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag));