From 50333977c613c9190307050bbede116555935ea9 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 19 Dec 2023 11:17:14 +0100 Subject: [PATCH] cipher_wrap: fix guards for alloc/free functions of CCM/GCM Signed-off-by: Valerio Setti --- library/cipher_wrap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c index c173899cbc..5be9799fce 100644 --- a/library/cipher_wrap.c +++ b/library/cipher_wrap.c @@ -114,7 +114,9 @@ enum mbedtls_cipher_base_index { MBEDTLS_CIPHER_BASE_PREVENT_EMPTY_ENUM }; -#if defined(MBEDTLS_GCM_C) +#if defined(MBEDTLS_GCM_C) && \ + (defined(MBEDTLS_CIPHER_HAVE_GCM_AES_VIA_LEGACY_OR_USE_PSA) || \ + defined(MBEDTLS_ARIA_C) || defined(MBEDTLS_CAMELLIA_C)) /* shared by all GCM ciphers */ static void *gcm_ctx_alloc(void) { @@ -134,7 +136,9 @@ static void gcm_ctx_free(void *ctx) } #endif /* MBEDTLS_GCM_C */ -#if defined(MBEDTLS_CCM_C) +#if defined(MBEDTLS_CCM_C) && \ + (defined(MBEDTLS_CIPHER_HAVE_CCM_AES_VIA_LEGACY_OR_USE_PSA) || \ + defined(MBEDTLS_ARIA_C) || defined(MBEDTLS_CAMELLIA_C)) /* shared by all CCM ciphers */ static void *ccm_ctx_alloc(void) {