commit 8ffd8a672fc576281487c21b634ba81a688d4f98
author Andrzej Kurek <andrzej.kurek@arm.com> Tue Sep 27 07:54:16 2022 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Tue Oct 18 05:59:43 2022 -0400
tree 3a543b4569cc7de153404d906611e6e573215d77
parent e5ae132d8742de5fc9548f8c52155031dd4d5dc6

Fix missing cipher mode dependencies

Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 555d32e..daa8b75 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1763,7 +1763,8 @@
     unsigned char key[32];
     unsigned char buf[64];
     const unsigned char *aes_tests;
-#if defined(MBEDTLS_CIPHER_MODE_CBC) || defined(MBEDTLS_CIPHER_MODE_CFB)
+#if defined(MBEDTLS_CIPHER_MODE_CBC) || defined(MBEDTLS_CIPHER_MODE_CFB) || \
+    defined(MBEDTLS_CIPHER_MODE_OFB)
     unsigned char iv[16];
 #endif
 #if defined(MBEDTLS_CIPHER_MODE_CBC)

tests/suites/test_suite_aes.function

diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function
index 5a64099..57b8b92 100644
--- a/tests/suites/test_suite_aes.function
+++ b/tests/suites/test_suite_aes.function
@@ -559,10 +559,14 @@
     defined(MBEDTLS_CIPHER_MODE_XTS) || \
     defined(MBEDTLS_CIPHER_MODE_CFB) || \
     defined(MBEDTLS_CIPHER_MODE_OFB)
-    mbedtls_aes_context aes_ctx;
     const unsigned char in[16] = { 0 };
     unsigned char out[16];
 #endif
+#if defined(MBEDTLS_CIPHER_MODE_CBC) || \
+    defined(MBEDTLS_CIPHER_MODE_CFB) || \
+    defined(MBEDTLS_CIPHER_MODE_OFB)
+mbedtls_aes_context aes_ctx;
+#endif
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
     mbedtls_aes_xts_context xts_ctx;
 #endif