commit c2d68f56118ce06debd8ad2e560ec7216f4c7bd5
author Valerio Setti <valerio.setti@nordicsemi.no> Tue Nov 07 10:36:55 2023 +0100
committer Valerio Setti <valerio.setti@nordicsemi.no> Wed Nov 15 09:16:37 2023 +0100
tree d42de2d688baec690699774f032ca2fba9a982a1
parent cab5eff98cf8e1c1e201c99951f67ecae511416d

adjust_legacy_from_psa: treat CCM and CCM* separately

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

include/mbedtls/config_adjust_legacy_from_psa.h

diff --git a/include/mbedtls/config_adjust_legacy_from_psa.h b/include/mbedtls/config_adjust_legacy_from_psa.h
index 6356bdd..ba623a8 100644
--- a/include/mbedtls/config_adjust_legacy_from_psa.h
+++ b/include/mbedtls/config_adjust_legacy_from_psa.h
@@ -847,6 +847,15 @@
     defined(PSA_HAVE_SOFT_KEY_TYPE_ARIA) || \
     defined(PSA_HAVE_SOFT_KEY_TYPE_CAMELLIA)
 #define MBEDTLS_PSA_BUILTIN_ALG_CCM 1
+#define MBEDTLS_CCM_C
+#endif
+#endif /* PSA_WANT_ALG_CCM */
+
+#if defined(PSA_WANT_ALG_CCM_STAR_NO_TAG)
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_CCM_STAR_NO_TAG) || \
+    defined(PSA_HAVE_SOFT_KEY_TYPE_AES) || \
+    defined(PSA_HAVE_SOFT_KEY_TYPE_ARIA) || \
+    defined(PSA_HAVE_SOFT_KEY_TYPE_CAMELLIA)
 #define MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG 1
 #define MBEDTLS_CCM_C
 #endif