From adc29202c2044ad039f2904b822c6a6fe84ac984 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 29 Apr 2024 01:29:52 +0200 Subject: mbedtls: Remove Kconfig options removed from mbedtls 3.6.0 These options are not available in mbedtls 3.6.0 and selecting them causes an error. MBEDTLS_CERTS_C was removed in: https://github.com/Mbed-TLS/mbedtls/commit/1aec64642cd0b9490c96fdd1fa9816741d93fce4 MBEDTLS_XTEA_C was removed in: https://github.com/Mbed-TLS/mbedtls/commit/10e8cf5fef7e062927bfbec69ad85fbf491b4299 MBEDTLS_SSL_TRUNCATED_HMAC was removed in: https://github.com/Mbed-TLS/mbedtls/commit/4a7010d1aaae937dfa328ef253d70d04b3b260ff Fixes: 0e0664264386 ("mbedtls: Update to version 3.6.0") Signed-off-by: Hauke Mehrtens --- package/libs/mbedtls/Config.in | 12 ------------ package/libs/mbedtls/Makefile | 3 --- 2 files changed, 15 deletions(-) diff --git a/package/libs/mbedtls/Config.in b/package/libs/mbedtls/Config.in index e80c342636..51f8bcbbdd 100644 --- a/package/libs/mbedtls/Config.in +++ b/package/libs/mbedtls/Config.in @@ -36,10 +36,6 @@ config MBEDTLS_RIPEMD160_C bool "MBEDTLS_RIPEMD160_C" default n -config MBEDTLS_XTEA_C - bool "MBEDTLS_XTEA_C" - default n - config MBEDTLS_RSA_NO_CRT bool "MBEDTLS_RSA_NO_CRT" default y @@ -140,10 +136,6 @@ config MBEDTLS_ECP_DP_CURVE448_ENABLED comment "Build Options - unselect features to reduce binary size" -config MBEDTLS_CERTS_C - bool "MBEDTLS_CERTS_C" - default n - config MBEDTLS_CIPHER_MODE_OFB bool "MBEDTLS_CIPHER_MODE_OFB" default n @@ -168,10 +160,6 @@ config MBEDTLS_SELF_TEST bool "MBEDTLS_SELF_TEST" default n -config MBEDTLS_SSL_TRUNCATED_HMAC - bool "MBEDTLS_SSL_TRUNCATED_HMAC" - default n - config MBEDTLS_THREADING_C bool "MBEDTLS_THREADING_C" default y diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index f6713f42f5..568ca28308 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -56,7 +56,6 @@ MBEDTLS_BUILD_OPTS_CIPHERS= \ CONFIG_MBEDTLS_NIST_KW_C \ CONFIG_MBEDTLS_RIPEMD160_C \ CONFIG_MBEDTLS_RSA_NO_CRT \ - CONFIG_MBEDTLS_XTEA_C \ CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED \ CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED \ CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED @@ -64,7 +63,6 @@ MBEDTLS_BUILD_OPTS_CIPHERS= \ MBEDTLS_BUILD_OPTS= \ $(MBEDTLS_BUILD_OPTS_CURVES) \ $(MBEDTLS_BUILD_OPTS_CIPHERS) \ - CONFIG_MBEDTLS_CERTS_C \ CONFIG_MBEDTLS_CIPHER_MODE_OFB \ CONFIG_MBEDTLS_CIPHER_MODE_XTS \ CONFIG_MBEDTLS_DEBUG_C \ @@ -73,7 +71,6 @@ MBEDTLS_BUILD_OPTS= \ CONFIG_MBEDTLS_PLATFORM_C \ CONFIG_MBEDTLS_SELF_TEST \ CONFIG_MBEDTLS_SSL_RENEGOTIATION \ - CONFIG_MBEDTLS_SSL_TRUNCATED_HMAC \ CONFIG_MBEDTLS_THREADING_C \ CONFIG_MBEDTLS_THREADING_PTHREAD \ CONFIG_MBEDTLS_VERSION_C \ -- cgit v1.2.3