Merge pull request #6157 from daverodgman/chacha-psa-defines-backport

backport 2.28: MBEDTLS_POLY1305_C and MBEDTLS_CHACHA20_C are needed when PSA_WANT_ALG_CHACHA20_POLY1305 is defined
Mbed-TLS · Aug 5, 2022 · 2c08ac7 · 2c08ac7
2 parents da12621 + aba5044
commit 2c08ac7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
@@ -446,6 +446,8 @@ extern "C" {
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_CHACHA20_POLY1305)
 #if defined(PSA_WANT_KEY_TYPE_CHACHA20)
 #define MBEDTLS_CHACHAPOLY_C
+#define MBEDTLS_CHACHA20_C
+#define MBEDTLS_POLY1305_C
 #define MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305 1
 #endif /* PSA_WANT_KEY_TYPE_CHACHA20 */
 #endif /* !MBEDTLS_PSA_ACCEL_ALG_CHACHA20_POLY1305 */