commit b476177849061f1fbbf7466e9a6b09adeffbeeca
author Dave Rodgman <dave.rodgman@arm.com> Mon Aug 14 18:43:09 2023 +0000
committer GitHub <noreply@github.com> Mon Aug 14 18:43:09 2023 +0000
tree 50507c501463b9efedc0f3beca02286b038a87e1
parent a797f152ee9ce0197c08201302633b7ef0acdd85
parent e3330f86d28af5e574c57cc6ea5c837fa9f9d5fb

Merge pull request #8073 from daverodgman/empty-enum-fix

Fix compile fail for empty enum in cipher_wrap

ChangeLog.d/fix-empty-enum.txt

diff --git a/ChangeLog.d/fix-empty-enum.txt b/ChangeLog.d/fix-empty-enum.txt
new file mode 100644
index 0000000..458d58f
--- /dev/null
+++ b/ChangeLog.d/fix-empty-enum.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fix compile failure due to empty enum in cipher_wrap.c, when building
+     with a very minimal configuration. Fixes #7625.

library/cipher_wrap.c

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index da4e739..6ab2f5f 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -120,8 +120,10 @@
     MBEDTLS_CIPHER_BASE_INDEX_NULL_BASE,
 #endif
 #if defined(MBEDTLS_CIPHER_MODE_XTS) && defined(MBEDTLS_AES_C)
-    MBEDTLS_CIPHER_BASE_INDEX_XTS_AES
+    MBEDTLS_CIPHER_BASE_INDEX_XTS_AES,
 #endif
+    /* Prevent compile failure due to empty enum */
+    MBEDTLS_CIPHER_BASE_PREVENT_EMPTY_ENUM
 };
 
 #if defined(MBEDTLS_GCM_C)