wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-10 21:50:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10251 from MarkAtwood/fix/aes-eax-empty-plaintext

Browse Source 
fix: AES-EAX allow empty plaintext
This commit is contained in:
David Garske
2026-07-09 08:24:55 -07:00
committed by GitHub
parent 5caa3565b8 a7cc526747
commit f430d5b472
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/aes.c
+40 -32
View File
@@ -19432,8 +19432,9 @@ int wc_AesEaxEncryptAuth(const byte* key, word32 keySz, byte* out,
int ret;
int eaxInited = 0;
if (key == NULL || out == NULL || in == NULL || nonce == NULL
|| authTag == NULL || authIn == NULL) {
if (key == NULL || nonce == NULL || authTag == NULL
|| (inSz > 0 && (out == NULL || in == NULL))
|| (authInSz > 0 && authIn == NULL)) {
return BAD_FUNC_ARG;
}
@@ -19495,8 +19496,9 @@ int wc_AesEaxDecryptAuth(const byte* key, word32 keySz, byte* out,
int ret;
int eaxInited = 0;
if (key == NULL || out == NULL || in == NULL || nonce == NULL
|| authTag == NULL || authIn == NULL) {
if (key == NULL || nonce == NULL || authTag == NULL
|| (inSz > 0 && (out == NULL || in == NULL))
|| (authInSz > 0 && authIn == NULL)) {
return BAD_FUNC_ARG;
}
@@ -19689,24 +19691,27 @@ int wc_AesEaxEncryptUpdate(AesEax* eax, byte* out,
{
int ret;
if (eax == NULL || out == NULL || in == NULL) {
if (eax == NULL || (inSz > 0 && (out == NULL || in == NULL))
|| (authInSz > 0 && authIn == NULL)) {
return BAD_FUNC_ARG;
}
/*
* Encrypt the plaintext using AES CTR
* C = CTR(M)
*/
if ((ret = wc_AesCtrEncrypt(&eax->aes, out, in, inSz)) != 0) {
return ret;
}
if (inSz > 0) {
/*
* Encrypt the plaintext using AES CTR
* C = CTR(M)
*/
if ((ret = wc_AesCtrEncrypt(&eax->aes, out, in, inSz)) != 0) {
return ret;
}
/*
* update OMAC with new ciphertext
* C' = OMAC^2_K(C)
*/
if ((ret = wc_CmacUpdate(&eax->ciphertextCmac, out, inSz)) != 0) {
return ret;
/*
* update OMAC with new ciphertext
* C' = OMAC^2_K(C)
*/
if ((ret = wc_CmacUpdate(&eax->ciphertextCmac, out, inSz)) != 0) {
return ret;
}
}
/* If there exists new auth data, update the OMAC for that as well */
@@ -19734,24 +19739,27 @@ int wc_AesEaxDecryptUpdate(AesEax* eax, byte* out,
{
int ret;
if (eax == NULL || out == NULL || in == NULL) {
if (eax == NULL || (inSz > 0 && (out == NULL || in == NULL))
|| (authInSz > 0 && authIn == NULL)) {
return BAD_FUNC_ARG;
}
/*
* Decrypt the plaintext using AES CTR
* C = CTR(M)
*/
if ((ret = wc_AesCtrEncrypt(&eax->aes, out, in, inSz)) != 0) {
return ret;
}
if (inSz > 0) {
/*
* Decrypt the plaintext using AES CTR
* C = CTR(M)
*/
if ((ret = wc_AesCtrEncrypt(&eax->aes, out, in, inSz)) != 0) {
return ret;
}
/*
* update OMAC with new ciphertext
* C' = OMAC^2_K(C)
*/
if ((ret = wc_CmacUpdate(&eax->ciphertextCmac, in, inSz)) != 0) {
return ret;
/*
* update OMAC with new ciphertext
* C' = OMAC^2_K(C)
*/
if ((ret = wc_CmacUpdate(&eax->ciphertextCmac, in, inSz)) != 0) {
return ret;
}
}
/* If there exists new auth data, update the OMAC for that as well */