diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt index 91c49cb085..373ade320b 100644 --- a/components/mbedtls/CMakeLists.txt +++ b/components/mbedtls/CMakeLists.txt @@ -367,7 +367,6 @@ if(CONFIG_MBEDTLS_DYNAMIC_BUFFER) mbedtls_ssl_handshake_server_step mbedtls_ssl_read mbedtls_ssl_write - mbedtls_ssl_session_reset mbedtls_ssl_free mbedtls_ssl_setup mbedtls_ssl_send_alert_message diff --git a/components/mbedtls/mbedtls b/components/mbedtls/mbedtls index b5d87eaa67..05556725a2 160000 --- a/components/mbedtls/mbedtls +++ b/components/mbedtls/mbedtls @@ -1 +1 @@ -Subproject commit b5d87eaa6748b7a6fa70593178c08b4480e9b71e +Subproject commit 05556725a2816aecbf87623c959a4a80ee7eb6de diff --git a/components/mbedtls/port/dynamic/esp_ssl_tls.c b/components/mbedtls/port/dynamic/esp_ssl_tls.c index c153ab03f1..04f9ce1053 100644 --- a/components/mbedtls/port/dynamic/esp_ssl_tls.c +++ b/components/mbedtls/port/dynamic/esp_ssl_tls.c @@ -418,21 +418,6 @@ void __wrap_mbedtls_ssl_free(mbedtls_ssl_context *ssl) __real_mbedtls_ssl_free(ssl); } -int __wrap_mbedtls_ssl_session_reset(mbedtls_ssl_context *ssl) -{ - CHECK_OK(esp_mbedtls_reset_add_tx_buffer(ssl)); - - CHECK_OK(esp_mbedtls_reset_add_rx_buffer(ssl)); - - CHECK_OK(__real_mbedtls_ssl_session_reset(ssl)); - - CHECK_OK(esp_mbedtls_reset_free_tx_buffer(ssl)); - - esp_mbedtls_reset_free_rx_buffer(ssl); - - return 0; -} - int __wrap_mbedtls_ssl_send_alert_message(mbedtls_ssl_context *ssl, unsigned char level, unsigned char message) { int ret; diff --git a/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c b/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c index f6263dadbb..27109aba6d 100644 --- a/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c +++ b/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c @@ -243,7 +243,7 @@ static void https_get_task(void *pvParameters) static int request_count; ESP_LOGI(TAG, "Completed %d requests", ++request_count); - printf("Minimum free heap size: %" PRIu32 " bytes\n", esp_get_minimum_free_heap_size()); + ESP_LOGI(TAG, "Minimum free heap size: %" PRIu32 " bytes\n", esp_get_minimum_free_heap_size()); for (int countdown = 10; countdown >= 0; countdown--) { ESP_LOGI(TAG, "%d...", countdown); diff --git a/examples/protocols/https_mbedtls/sdkconfig.ci b/examples/protocols/https_mbedtls/sdkconfig.ci index 81b8c599e6..be71ecf47c 100644 --- a/examples/protocols/https_mbedtls/sdkconfig.ci +++ b/examples/protocols/https_mbedtls/sdkconfig.ci @@ -9,3 +9,4 @@ CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 CONFIG_EXAMPLE_ETH_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y +CONFIG_MBEDTLS_DYNAMIC_BUFFER=y