wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Peer review feedback.

Browse Source
This commit is contained in:
David Garske
2019-12-31 08:08:33 -08:00
parent b901a2cd35
commit f01999b322
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/chacha20_poly1305.c
View File

@@ -166,6 +166,9 @@ int wc_ChaCha20Poly1305_CheckTag(
const byte authTagChk[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]) const byte authTagChk[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE])
{ {
int ret = 0; int ret = 0;
if (authTag == NULL || authTagChk == NULL) {
return BAD_FUNC_ARG;
}
if (ConstantCompare(authTag, authTagChk, if (ConstantCompare(authTag, authTagChk,
CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE) != 0) { CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE) != 0) {
ret = MAC_CMP_FAILED_E; ret = MAC_CMP_FAILED_E;
@@ -383,7 +386,6 @@ int wc_ChaCha20Poly1305_Final(ChaChaPoly_Aead* aead,
if (aead->state != CHACHA20_POLY1305_STATE_DATA) { if (aead->state != CHACHA20_POLY1305_STATE_DATA) {
return BAD_STATE_E; return BAD_STATE_E;
} }
aead->state = CHACHA20_POLY1305_STATE_FINAL;
/* Pad the ciphertext to 16 bytes */ /* Pad the ciphertext to 16 bytes */
paddingLen = -(int)aead->dataLen & paddingLen = -(int)aead->dataLen &

25
wolfcrypt/test/test.c
View File

@@ -5030,8 +5030,8 @@ int chacha20_poly1305_aead_test(void)
0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38 0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38
}; };
byte generatedCiphertext[272]; byte generatedCiphertext[265]; /* max plaintext2/cipher2 */
byte generatedPlaintext[272]; byte generatedPlaintext[265]; /* max plaintext2/cipher2 */
byte generatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]; byte generatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE];
int err; int err;
#ifndef NO_CHACHAPOLY_AEAD_IUF #ifndef NO_CHACHAPOLY_AEAD_IUF
@@ -5208,32 +5208,23 @@ int chacha20_poly1305_aead_test(void)
err = wc_ChaCha20Poly1305_UpdateAad(&aead, aad1, sizeof(aad1)); err = wc_ChaCha20Poly1305_UpdateAad(&aead, aad1, sizeof(aad1));
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4530; return -4530;
aead.state = CHACHA20_POLY1305_STATE_FINAL; aead.state = CHACHA20_POLY1305_STATE_INIT;
err = wc_ChaCha20Poly1305_UpdateAad(&aead, aad1, sizeof(aad1)); err = wc_ChaCha20Poly1305_UpdateData(&aead, generatedPlaintext,
sizeof(plaintext1));
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4531; return -4531;
aead.state = CHACHA20_POLY1305_STATE_INIT; aead.state = CHACHA20_POLY1305_STATE_INIT;
err = wc_ChaCha20Poly1305_UpdateData(&aead, generatedPlaintext,
sizeof(plaintext1));
if (err != BAD_STATE_E)
return -4532;
aead.state = CHACHA20_POLY1305_STATE_FINAL;
err = wc_ChaCha20Poly1305_UpdateData(&aead, generatedPlaintext,
sizeof(plaintext1));
if (err != BAD_STATE_E)
return -4533;
aead.state = CHACHA20_POLY1305_STATE_INIT;
err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag); err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag);
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4534; return -4532;
aead.state = CHACHA20_POLY1305_STATE_READY; aead.state = CHACHA20_POLY1305_STATE_READY;
err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag); err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag);
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4535; return -4533;
aead.state = CHACHA20_POLY1305_STATE_AAD; aead.state = CHACHA20_POLY1305_STATE_AAD;
err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag); err = wc_ChaCha20Poly1305_Final(&aead, generatedAuthTag);
if (err != BAD_STATE_E) if (err != BAD_STATE_E)
return -4536; return -4534;
XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext)); XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext));
XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag)); XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag));

1
wolfssl/wolfcrypt/chacha20_poly1305.h
View File

@@ -58,7 +58,6 @@ enum {
CHACHA20_POLY1305_STATE_READY = 1, CHACHA20_POLY1305_STATE_READY = 1,
CHACHA20_POLY1305_STATE_AAD = 2, CHACHA20_POLY1305_STATE_AAD = 2,
CHACHA20_POLY1305_STATE_DATA = 3, CHACHA20_POLY1305_STATE_DATA = 3,
CHACHA20_POLY1305_STATE_FINAL = 4,
}; };
typedef struct ChaChaPoly_Aead { typedef struct ChaChaPoly_Aead {