From 2276b07b39af30c491c66f6c74a6e5fdd8987b39 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Sun, 29 Oct 2023 19:18:05 +0530 Subject: [PATCH] fix(esp-tls): Fix the https_request example build for esp-wolfssl --- .../protocols/https_request/main/Kconfig.projbuild | 5 +++++ .../https_request/main/https_request_example_main.c | 10 +++++----- examples/protocols/https_request/sdkconfig.defaults | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/examples/protocols/https_request/main/Kconfig.projbuild b/examples/protocols/https_request/main/Kconfig.projbuild index 7b8c60d011..60a72c61dd 100644 --- a/examples/protocols/https_request/main/Kconfig.projbuild +++ b/examples/protocols/https_request/main/Kconfig.projbuild @@ -1,5 +1,10 @@ menu "Example Configuration" + config EXAMPLE_USING_ESP_TLS_MBEDTLS + bool + depends on ESP_TLS_USING_MBEDTLS + default y + config EXAMPLE_CLIENT_SESSION_TICKETS bool "Enable Client session ticket support" default n diff --git a/examples/protocols/https_request/main/https_request_example_main.c b/examples/protocols/https_request/main/https_request_example_main.c index f386ed4e2a..d32186b576 100644 --- a/examples/protocols/https_request/main/https_request_example_main.c +++ b/examples/protocols/https_request/main/https_request_example_main.c @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 * - * SPDX-FileContributor: 2015-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileContributor: 2015-2023 Espressif Systems (Shanghai) CO LTD */ #include @@ -40,7 +40,7 @@ #include "esp_tls.h" #include "sdkconfig.h" -#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE +#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE && CONFIG_EXAMPLE_USING_ESP_TLS_MBEDTLS #include "esp_crt_bundle.h" #endif #include "time_sync.h" @@ -164,7 +164,7 @@ exit: } } -#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE +#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE && CONFIG_EXAMPLE_USING_ESP_TLS_MBEDTLS static void https_get_request_using_crt_bundle(void) { ESP_LOGI(TAG, "https_request using crt bundle"); @@ -173,7 +173,7 @@ static void https_get_request_using_crt_bundle(void) }; https_get_request(cfg, WEB_URL, HOWSMYSSL_REQUEST); } -#endif // CONFIG_MBEDTLS_CERTIFICATE_BUNDLE +#endif // CONFIG_MBEDTLS_CERTIFICATE_BUNDLE && CONFIG_EXAMPLE_USING_ESP_TLS_MBEDTLS static void https_get_request_using_cacert_buf(void) { @@ -253,7 +253,7 @@ static void https_request_task(void *pvparameters) https_get_request_using_already_saved_session(server_url); #endif -#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE +#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE && CONFIG_EXAMPLE_USING_ESP_TLS_MBEDTLS https_get_request_using_crt_bundle(); #endif ESP_LOGI(TAG, "Minimum free heap size: %" PRIu32 " bytes", esp_get_minimum_free_heap_size()); diff --git a/examples/protocols/https_request/sdkconfig.defaults b/examples/protocols/https_request/sdkconfig.defaults index 4fe81b2f33..ec3edfc8b9 100644 --- a/examples/protocols/https_request/sdkconfig.defaults +++ b/examples/protocols/https_request/sdkconfig.defaults @@ -1,2 +1,3 @@ CONFIG_MBEDTLS_HAVE_TIME_DATE=y CONFIG_LWIP_SNTP_MAX_SERVERS=2 +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y