Merge branch 'bugfix/mbedtls_poly1305_build_v6.0' into 'release/v6.0'

fix(mbedtls): fix MBEDTLS_POLY1305_C build config (v6.0)

See merge request espressif/esp-idf!45941

components/mbedtls/Kconfig

@@ -1162,12 +1162,6 @@ menu "mbedTLS"
     endmenu
 
     menu "Hash functions"
-        config MBEDTLS_POLY1305_C
-            bool "Poly1305 MAC algorithm"
-            default n
-            help
-                Enable support for Poly1305 MAC algorithm.
-
         config MBEDTLS_RIPEMD160_C
             bool "Enable RIPEMD-160 hash algorithm"
             default n
@@ -1618,7 +1612,7 @@ menu "mbedTLS"
         config MBEDTLS_CHACHAPOLY_C
             bool "ChaCha20-Poly1305 AEAD algorithm"
             default n
-            depends on MBEDTLS_CHACHA20_C && MBEDTLS_POLY1305_C
+            depends on MBEDTLS_CHACHA20_C
             help
                 Enable support for ChaCha20-Poly1305 AEAD algorithm.
 

components/mbedtls/config/mbedtls_preset_default.conf

@@ -169,7 +169,6 @@ CONFIG_MBEDTLS_HMAC_DRBG_C=y
 CONFIG_MBEDTLS_BASE64_C=y
 
 CONFIG_MBEDTLS_CHACHA20_C=n
-CONFIG_MBEDTLS_POLY1305_C=n
 
 #
 # End of mbedTLS Minimal Configuration Preset

components/mbedtls/port/include/mbedtls/esp_config.h

@@ -2008,7 +2008,6 @@
 #ifdef CONFIG_MBEDTLS_CHACHA20_C
 #define PSA_WANT_KEY_TYPE_CHACHA20 1
 #else
-#undef MBEDTLS_CHACHA20_C
 #undef PSA_WANT_KEY_TYPE_CHACHA20
 #endif
 
@@ -2019,12 +2018,11 @@
  *
  * Module:  library/chachapoly.c
  *
- * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ * This module requires: MBEDTLS_CHACHA20_C
  */
 #ifdef CONFIG_MBEDTLS_CHACHAPOLY_C
 #define PSA_WANT_ALG_CHACHA20_POLY1305 1
 #else
-#undef MBEDTLS_CHACHAPOLY_C
 #undef PSA_WANT_ALG_CHACHA20_POLY1305
 #endif
 
@@ -2520,20 +2518,6 @@
  */
 #define MBEDTLS_PLATFORM_C
 
-/**
- * \def MBEDTLS_POLY1305_C
- *
- * Enable the Poly1305 MAC algorithm.
- *
- * Module:  library/poly1305.c
- * Caller:  library/chachapoly.c
- */
-#ifdef CONFIG_MBEDTLS_POLY1305_C
-#define MBEDTLS_POLY1305_C
-#else
-#undef MBEDTLS_POLY1305_C
-#endif
-
 /**
  * \def MBEDTLS_RIPEMD160_C
  *

examples/protocols/https_request/sdkconfig.defaults

@@ -1,3 +1,5 @@
 CONFIG_MBEDTLS_HAVE_TIME_DATE=y
 CONFIG_LWIP_SNTP_MAX_SERVERS=2
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+CONFIG_MBEDTLS_CHACHA20_C=y
+CONFIG_MBEDTLS_CHACHAPOLY_C=y