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

wolfssl/wolfcrypt/aes.h and wolfssl/wolfcrypt/cmac.h: fix circular dependency mitigation for struct AesEax more robustly.

Browse Source
This commit is contained in:
Daniel Pouzzner
2026-04-14 23:08:59 -05:00
parent 9bc221bfec
commit 575ac48664
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfssl/wolfcrypt/aes.h
+24 -15
View File
@@ -821,22 +821,11 @@ WOLFSSL_LOCAL int wc_local_CmacUpdateAes(struct Cmac *cmac, const byte* in,
#ifdef WOLFSSL_AES_EAX
/* Because of the circular dependency between AES and CMAC, we need to prevent
* inclusion of AES EAX from CMAC to avoid a recursive inclusion */
#ifndef WOLF_CRYPT_CMAC_H
#include <wolfssl/wolfcrypt/cmac.h>
struct AesEax {
Aes aes;
Cmac nonceCmac;
Cmac aadCmac;
Cmac ciphertextCmac;
byte nonceCmacFinal[WC_AES_BLOCK_SIZE];
byte aadCmacFinal[WC_AES_BLOCK_SIZE];
byte ciphertextCmacFinal[WC_AES_BLOCK_SIZE];
byte prefixBuf[WC_AES_BLOCK_SIZE];
};
#endif /* !defined(WOLF_CRYPT_CMAC_H) */
/* Note that struct AesEax is defined at the end of this file, to work around
* circular dependency between AES and CMAC.
*/
struct AesEax;
typedef struct AesEax AesEax;
/* One-shot API */
@@ -1120,3 +1109,23 @@ WOLFSSL_LOCAL void AES_XTS_decrypt_AARCH32(const byte* in, byte* out,
#endif /* NO_AES */
#endif /* WOLF_CRYPT_AES_H */
/* Because of the circular dependency between AES and CMAC, we need to define
* struct AesEax here, with careful gating.
*/
#if defined(WOLFSSL_AES_EAX) && !defined(WC_AES_INCLUDE_FOR_CMAC_H) && \
!defined(WC_AESEAX_STRUCT_DEFINED)
#include <wolfssl/wolfcrypt/cmac.h>
struct AesEax {
Aes aes;
Cmac nonceCmac;
Cmac aadCmac;
Cmac ciphertextCmac;
byte nonceCmacFinal[WC_AES_BLOCK_SIZE];
byte aadCmacFinal[WC_AES_BLOCK_SIZE];
byte ciphertextCmacFinal[WC_AES_BLOCK_SIZE];
byte prefixBuf[WC_AES_BLOCK_SIZE];
};
#define WC_AESEAX_STRUCT_DEFINED
#endif /* WOLFSSL_AES_EAX && !WC_AES_INCLUDE_FOR_CMAC_H && */
/* !WC_AESEAX_STRUCT_DEFINED */
wolfssl/wolfcrypt/cmac.h
+6 -1
View File
@@ -28,7 +28,12 @@
#ifdef WOLFSSL_CMAC
#ifndef NO_AES
#include <wolfssl/wolfcrypt/aes.h>
/* Inhibit definition of struct AesEax, with its circular dependency on the
* below definition of struct Cmac.
*/
#define WC_AES_INCLUDE_FOR_CMAC_H
#include <wolfssl/wolfcrypt/aes.h>
#undef WC_AES_INCLUDE_FOR_CMAC_H
#endif
#if defined(HAVE_FIPS) && \