mbedtls: Expose MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED config option

This enables software that requires this cipher suite (e.g. OpenThread Border
Router) to be compiled against the shared library rather than a separate copy.

Signed-off-by: Karsten Sperling <ksperling@apple.com>
Link: https://github.com/openwrt/openwrt/pull/19489
(cherry picked from commit 97dc9f8dbfde8725ca26ae7ce0f348488e62e29e)
Link: https://github.com/openwrt/openwrt/pull/19839
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/libs/mbedtls/Config.in b/package/libs/mbedtls/Config.in
index 0a760ed2cb80d6876798f2042967bcf42487b567..2009d5db96f3c888972d05046a8f24c790ac53ac 100644 (file)
--- a/package/libs/mbedtls/Config.in
+++ b/package/libs/mbedtls/Config.in
@@ -84,6 +84,10 @@ config MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
        bool "MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED"
        default n
 
+config MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+       bool "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED"
+       default n
+
 comment "Curves - unselect old or less-used curves to reduce binary size"
 
 config MBEDTLS_ECP_DP_SECP192R1_ENABLED

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index d6dfd6b68ff3d3ee56fd01b4593f04bc46822f35..d6dc0f7805aa46103ffa73a2991b0e90874c8e6a 100644 (file)
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -53,6 +53,7 @@ MBEDTLS_BUILD_OPTS_CIPHERS= \
   CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED \
   CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED \
   CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED \
+  CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED \
   CONFIG_MBEDTLS_NIST_KW_C \
   CONFIG_MBEDTLS_RIPEMD160_C \
   CONFIG_MBEDTLS_RSA_NO_CRT \