File tree Expand file tree Collapse file tree 5 files changed +9
-8
lines changed
Expand file tree Collapse file tree 5 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -51,6 +51,10 @@ Mbed TLS
5151 * ``CONFIG_MBEDTLS_ENTROPY_ENABLED `` is now :kconfig:option: ``CONFIG_MBEDTLS_ENTROPY_C` `,
5252 * ``CONFIG_MBEDTLS_ZEPHYR_ENTROPY `` is now :kconfig:option: ``CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR` `.
5353
54+ * The Kconfig option ``CONFIG_MBEDTLS_SSL_EXPORT_KEYS `` was removed because the
55+ corresponding build symbol was removed in Mbed TLS 3.1.0 and is now assumed to
56+ be enabled. (:github: `77657 `)
57+
5458Trusted Firmware-M
5559==================
5660
Original file line number Diff line number Diff line change @@ -19,9 +19,6 @@ if MBEDTLS_TLS_VERSION_1_2
1919config MBEDTLS_DTLS
2020 bool "Support for DTLS"
2121
22- config MBEDTLS_SSL_EXPORT_KEYS
23- bool "Support for exporting SSL key block and master secret"
24-
2522config MBEDTLS_SSL_ALPN
2623 bool "Support for setting the supported Application Layer Protocols"
2724
Original file line number Diff line number Diff line change 324324#define MBEDTLS_ENTROPY_C
325325#endif
326326
327- #if defined(CONFIG_MBEDTLS_SSL_EXPORT_KEYS )
328- #define MBEDTLS_SSL_EXPORT_KEYS
329- #endif
330-
331327#if defined(CONFIG_MBEDTLS_SSL_ALPN )
332328#define MBEDTLS_SSL_ALPN
333329#endif
Original file line number Diff line number Diff line change @@ -163,6 +163,11 @@ endforeach()
163163string (REPLACE " " ";" OT_PARAM_LIST " ${CONFIG_OPENTHREAD_CUSTOM_PARAMETERS} " )
164164target_compile_definitions (ot-config INTERFACE ${OT_PARAM_LIST} )
165165
166+ # Since Mbed TLS 3.1.0 MBEDTLS_SSL_EXPORT_KEYS was removed as build symbol and
167+ # it's always assumed to be enabled. Corresponding kconfig was removed from
168+ # Zephyr as well, but OpenThread code still uses it, so we add it here.
169+ target_compile_definitions (ot-config INTERFACE -DMBEDTLS_SSL_EXPORT_KEYS)
170+
166171# Zephyr compiler options
167172target_include_directories (ot-config INTERFACE
168173 $<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES >
Original file line number Diff line number Diff line change @@ -193,7 +193,6 @@ config OPENTHREAD_MBEDTLS
193193 select MBEDTLS_ECP_DP_SECP256R1_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER || \
194194 OPENTHREAD_SRP_CLIENT || OPENTHREAD_SRP_SERVER
195195 select MBEDTLS_ECP_NIST_OPTIM if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
196- select MBEDTLS_SSL_EXPORT_KEYS if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
197196 select MBEDTLS_CTR_DRBG_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
198197 select MBEDTLS_HMAC_DRBG_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER || \
199198 OPENTHREAD_SRP_CLIENT || OPENTHREAD_SRP_SERVER
You can’t perform that action at this time.
0 commit comments