fix(mbedtls): bring back deprecated config MBEDTLS_ECJPAKE_C

components/mbedtls/Kconfig

@@ -728,7 +728,7 @@ menu "mbedTLS"
 
             config MBEDTLS_KEY_EXCHANGE_ECJPAKE
                 bool "Enable ECJPAKE based ciphersuite modes"
-                depends on MBEDTLS_ECP_DP_SECP256R1_ENABLED
+                depends on MBEDTLS_ECJPAKE_C && MBEDTLS_ECP_DP_SECP256R1_ENABLED
                 default n
                 help
                     Enable to support ciphersuites with prefix TLS-ECJPAKE-WITH-
@@ -1093,6 +1093,13 @@ menu "mbedTLS"
                 help
                         Enable ECDH. Needed to use ECDHE-xxx TLS ciphersuites.
 
+            config MBEDTLS_ECJPAKE_C
+                bool "Elliptic curve J-PAKE"
+                depends on MBEDTLS_ECP_C
+                default n
+                help
+                        Enable ECJPAKE. Needed to use ECJPAKE-xxx TLS ciphersuites.
+
             config MBEDTLS_ECDSA_C
                 bool "Elliptic Curve DSA"
                 depends on MBEDTLS_ECDH_C && MBEDTLS_ECP_C

components/mbedtls/config/mbedtls_preset_default.conf

@@ -115,6 +115,7 @@ CONFIG_MBEDTLS_ECP_C=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=n
 CONFIG_MBEDTLS_ECDH_C=y
+CONFIG_MBEDTLS_ECJPAKE_C=n
 CONFIG_MBEDTLS_ECDSA_C=y
 CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=y
 CONFIG_MBEDTLS_PK_PARSE_EC_COMPRESSED=y

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

@@ -2095,6 +2095,18 @@
 #undef PSA_WANT_ALG_ECDH
 #endif
 
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the ECJPAKE based ciphersuites.
+ */
+#ifdef CONFIG_MBEDTLS_ECJPAKE_C
+#define PSA_WANT_ALG_JPAKE 1
+#else
+#undef PSA_WANT_ALG_JPAKE
+#undef PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
+#endif
+
 /**
  * \def MBEDTLS_ECDSA_C
  *

examples/openthread/ot_br/sdkconfig.defaults

@@ -12,6 +12,7 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of TLS Key Exchange Methods
 
 # end of mbedTLS

examples/openthread/ot_cli/sdkconfig.defaults

@@ -13,6 +13,7 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of mbedTLS
 
 #

examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults

@@ -11,6 +11,7 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 #
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of mbedTLS
 
 #

examples/openthread/ot_sleepy_device/light_sleep/sdkconfig.defaults

@@ -11,6 +11,7 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 #
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of mbedTLS
 
 #

examples/openthread/ot_trel/sdkconfig.defaults

@@ -13,6 +13,7 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of mbedTLS
 
 #