Skip to content

Commit 9c54600

Browse files
committed
feat(mbedtls): update to version 3.6.4
1 parent 37733a8 commit 9c54600

File tree

5 files changed

+30
-3
lines changed

5 files changed

+30
-3
lines changed

components/mbedtls/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,15 @@ menu "mbedTLS"
245245

246246
See mbedTLS documentation for required API and more details.
247247

248+
config MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
249+
bool "Enable keying material export"
250+
default n
251+
depends on MBEDTLS_TLS_ENABLED
252+
help
253+
Enable shared symmetric keys export for TLS sessions using mbedtls_ssl_export_keying_material()
254+
after SSL handshake. The process for deriving the keys is specified in RFC 5705 for TLS 1.2
255+
and in RFC 8446, Section 7.5, for TLS 1.3.
256+
248257
config MBEDTLS_PKCS7_C
249258
bool "Enable PKCS number 7"
250259
default y

components/mbedtls/mbedtls

Submodule mbedtls updated 141 files

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,24 @@
11431143
#undef MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
11441144
#endif
11451145

1146+
/**
1147+
* \def MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
1148+
*
1149+
* When this option is enabled, the client and server can extract additional
1150+
* shared symmetric keys after an SSL handshake using the function
1151+
* mbedtls_ssl_export_keying_material().
1152+
*
1153+
* The process for deriving the keys is specified in RFC 5705 for TLS 1.2 and
1154+
* in RFC 8446, Section 7.5, for TLS 1.3.
1155+
*
1156+
* Comment this macro to disable mbedtls_ssl_export_keying_material().
1157+
*/
1158+
#ifdef CONFIG_MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
1159+
#define MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
1160+
#else
1161+
#undef MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
1162+
#endif
1163+
11461164
/**
11471165
* \def MBEDTLS_SSL_CBC_RECORD_SPLITTING
11481166
*

docs/en/api-reference/protocols/mbedtls.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,5 @@ Reducing Binary Size
118118
Under ``Component Config -> mbedTLS``, there are multiple Mbed TLS features which are enabled by default but can be disabled if not needed to save code size. More information can be about this can be found in :ref:`Minimizing Binary Size <minimizing_binary_mbedtls>` docs.
119119

120120

121-
.. _`API Reference`: https://mbed-tls.readthedocs.io/projects/api/en/v3.6.3/
121+
.. _`API Reference`: https://mbed-tls.readthedocs.io/projects/api/en/v3.6.4/
122122
.. _`Knowledge Base`: https://mbed-tls.readthedocs.io/en/latest/kb/

docs/zh_CN/api-reference/protocols/mbedtls.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,5 @@ ESP-IDF 中的示例使用 :doc:`/api-reference/protocols/esp_tls`,为访问
118118
在 ``Component Config -> mbedTLS`` 中,有多个 Mbed TLS 功能默认为启用状态。如果不需要这些功能,可将其禁用以减小固件大小。要了解更多信息,请参考 :ref:`Minimizing Binary Size <minimizing_binary_mbedtls>` 文档。
119119

120120

121-
.. _`API Reference`: https://mbed-tls.readthedocs.io/projects/api/en/v3.6.3/
121+
.. _`API Reference`: https://mbed-tls.readthedocs.io/projects/api/en/v3.6.4/
122122
.. _`Knowledge Base`: https://mbed-tls.readthedocs.io/en/latest/kb/

0 commit comments

Comments
 (0)