From 6c8f6597f95144ce3e365fdd1a56bfee42d7d0a5 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Mon, 17 Oct 2022 15:08:29 +0530 Subject: [PATCH] mbedtls: test_app: keep release config enabled for ESP32 Before `test_apps` migration, we had an independent release config, but we can safely enable it in the default configuration for ESP32 target itself. This helps to catch any potential issues that may occur in relevant tests because of compiler optimization flags. --- components/mbedtls/test_apps/main/test_esp_crt_bundle.c | 7 +++++++ components/mbedtls/test_apps/sdkconfig.defaults.esp32 | 1 + 2 files changed, 8 insertions(+) diff --git a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c index 1080863105..a4b0af46a5 100644 --- a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c +++ b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c @@ -23,6 +23,7 @@ #include "mbedtls/net_sockets.h" #include "mbedtls/error.h" #include "mbedtls/debug.h" +#include "mbedtls/esp_debug.h" #include "esp_crt_bundle.h" #include "esp_random.h" @@ -91,6 +92,9 @@ esp_err_t server_setup(mbedtls_endpoint_t *server) { int ret; mbedtls_ssl_config_init( &server->conf ); +#if CONFIG_MBEDTLS_DEBUG + mbedtls_esp_enable_debug_log( &server->conf, CONFIG_MBEDTLS_DEBUG_LEVEL ); +#endif mbedtls_net_init( &server->listen_fd ); mbedtls_net_init( &server->client_fd ); mbedtls_ssl_init( &server->ssl ); @@ -213,6 +217,9 @@ esp_err_t client_setup(mbedtls_endpoint_t *client) { int ret; mbedtls_ssl_config_init( &client->conf ); +#if CONFIG_MBEDTLS_DEBUG + mbedtls_esp_enable_debug_log( &client->conf, CONFIG_MBEDTLS_DEBUG_LEVEL ); +#endif mbedtls_net_init( &client->client_fd ); mbedtls_ssl_init( &client->ssl ); mbedtls_x509_crt_init( &client->cert ); diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32 b/components/mbedtls/test_apps/sdkconfig.defaults.esp32 index 59093635f0..66cbe6577e 100644 --- a/components/mbedtls/test_apps/sdkconfig.defaults.esp32 +++ b/components/mbedtls/test_apps/sdkconfig.defaults.esp32 @@ -1,3 +1,4 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_SPI_FLASH_SHARE_SPI1_BUS=y +CONFIG_COMPILER_OPTIMIZATION_SIZE=y