commit 98ffc8e7c30a8a3aa6d688e416d299567b4deb9c
author Tom Cosgrove <tom.cosgrove@arm.com> Mon Jun 03 15:35:32 2024 +0000
committer GitHub <noreply@github.com> Mon Jun 03 15:35:32 2024 +0000
tree e7c95fe44c336a05dd4c8809f951124057e7147b
parent e2add3ac086225115765ba1d43affbd998df37c3
parent 7e2ce994001b62827788af4acf7a36e7756979d8

Merge pull request #9178 from valeriosetti/fix-psa-cmac

adjust_legacy_crypto: enable CIPHER_C when PSA CMAC is builtin

ChangeLog.d/fix-psa-cmac.txt

diff --git a/ChangeLog.d/fix-psa-cmac.txt b/ChangeLog.d/fix-psa-cmac.txt
new file mode 100644
index 0000000..e3c8aec
--- /dev/null
+++ b/ChangeLog.d/fix-psa-cmac.txt
@@ -0,0 +1,4 @@
+Bugfix
+   * Fix the build when MBEDTLS_PSA_CRYPTO_CONFIG is enabled and the built-in
+     CMAC is enabled, but no built-in unauthenticated cipher is enabled.
+     Fixes #9209.

include/mbedtls/config_adjust_legacy_crypto.h

diff --git a/include/mbedtls/config_adjust_legacy_crypto.h b/include/mbedtls/config_adjust_legacy_crypto.h
index 8541161..7dafbae 100644
--- a/include/mbedtls/config_adjust_legacy_crypto.h
+++ b/include/mbedtls/config_adjust_legacy_crypto.h
@@ -58,7 +58,8 @@
     defined(MBEDTLS_PSA_BUILTIN_ALG_ECB_NO_PADDING) || \
     defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING) || \
     defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7) || \
-    defined(MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG))
+    defined(MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_CMAC))
 #define MBEDTLS_CIPHER_C
 #endif