From 77049b8b6cb60cb5afe2e6e190cdc9173e4b6108 Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Sat, 24 Jun 2023 14:39:47 +0100
Subject: [PATCH] Dependency fixes

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 library/cipher_wrap.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index a7b1f90c6..404e205b4 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -2313,17 +2313,17 @@ const mbedtls_cipher_base_t *mbedtls_cipher_base_lookup_table[] = {
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_CCM_C)
+#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_AES_C)
     &ccm_aes_info,
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_CCM_C)
+#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_ARIA_C)
     &ccm_aria_info,
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_CCM_C)
+#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_CAMELLIA_C)
     &ccm_camellia_info,
 #else
     NULL,
@@ -2353,17 +2353,17 @@ const mbedtls_cipher_base_t *mbedtls_cipher_base_lookup_table[] = {
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_GCM_C)
+#if defined(MBEDTLS_GCM_C) && defined(MBEDTLS_AES_C)
     &gcm_aes_info,
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_GCM_C)
+#if defined(MBEDTLS_GCM_C) && defined(MBEDTLS_ARIA_C)
     &gcm_aria_info,
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_GCM_C)
+#if defined(MBEDTLS_GCM_C) && defined(MBEDTLS_CAMELLIA_C)
     &gcm_camellia_info,
 #else
     NULL,
@@ -2378,7 +2378,7 @@ const mbedtls_cipher_base_t *mbedtls_cipher_base_lookup_table[] = {
 #else
     NULL,
 #endif
-#if defined(MBEDTLS_CIPHER_MODE_XTS)
+#if defined(MBEDTLS_CIPHER_MODE_XTS) && defined(MBEDTLS_AES_C)
     &xts_aes_info,
 #else
     NULL,