examples: add dependency on cert bundle configuration

Refactor examples to build with MBEDTLS_CERTIFICATE_BUNDLE disabled. Only examples
that can work with certificate bundle disabled have been modified here.
This commit is contained in:
Mahavir Jain
2022-06-12 09:30:31 +05:30
parent 660b876465
commit a597cc80aa
2 changed files with 20 additions and 15 deletions

View File

@ -18,7 +18,9 @@
#include "esp_netif.h" #include "esp_netif.h"
#include "protocol_examples_common.h" #include "protocol_examples_common.h"
#include "esp_tls.h" #include "esp_tls.h"
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
#include "esp_crt_bundle.h" #include "esp_crt_bundle.h"
#endif
#include "esp_http_client.h" #include "esp_http_client.h"
@ -367,6 +369,7 @@ static void http_auth_digest(void)
} }
#endif #endif
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void https_with_url(void) static void https_with_url(void)
{ {
esp_http_client_config_t config = { esp_http_client_config_t config = {
@ -386,6 +389,7 @@ static void https_with_url(void)
} }
esp_http_client_cleanup(client); esp_http_client_cleanup(client);
} }
#endif // CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void https_with_hostname_path(void) static void https_with_hostname_path(void)
{ {
@ -643,6 +647,7 @@ static void http_native_request(void)
esp_http_client_cleanup(client); esp_http_client_cleanup(client);
} }
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void http_partial_download(void) static void http_partial_download(void)
{ {
esp_http_client_config_t config = { esp_http_client_config_t config = {
@ -687,6 +692,7 @@ static void http_partial_download(void)
esp_http_client_cleanup(client); esp_http_client_cleanup(client);
} }
#endif // CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void http_test_task(void *pvParameters) static void http_test_task(void *pvParameters)
{ {
@ -701,7 +707,9 @@ static void http_test_task(void *pvParameters)
#endif #endif
http_relative_redirect(); http_relative_redirect();
http_absolute_redirect(); http_absolute_redirect();
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
https_with_url(); https_with_url();
#endif
https_with_hostname_path(); https_with_hostname_path();
http_redirect_to_https(); http_redirect_to_https();
http_download_chunk(); http_download_chunk();
@ -709,7 +717,9 @@ static void http_test_task(void *pvParameters)
https_async(); https_async();
https_with_invalid_url(); https_with_invalid_url();
http_native_request(); http_native_request();
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
http_partial_download(); http_partial_download();
#endif
ESP_LOGI(TAG, "Finish http example"); ESP_LOGI(TAG, "Finish http example");
vTaskDelete(NULL); vTaskDelete(NULL);

View File

@ -5,22 +5,13 @@
* *
* Adapted from the ssl_client1 example in mbedtls. * Adapted from the ssl_client1 example in mbedtls.
* *
* Original Copyright (C) 2006-2016, ARM Limited, All Rights Reserved, Apache 2.0 License. * SPDX-FileCopyrightText: 2006-2016 ARM Limited, All Rights Reserved
* Additions Copyright (C) Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD, Apache 2.0 License.
* *
* SPDX-License-Identifier: Apache-2.0
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * SPDX-FileContributor: 2015-2022 Espressif Systems (Shanghai) CO LTD
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@ -41,7 +32,9 @@
#include "lwip/dns.h" #include "lwip/dns.h"
#include "esp_tls.h" #include "esp_tls.h"
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
#include "esp_crt_bundle.h" #include "esp_crt_bundle.h"
#endif
/* Constants that aren't configurable in menuconfig */ /* Constants that aren't configurable in menuconfig */
#define WEB_SERVER "www.howsmyssl.com" #define WEB_SERVER "www.howsmyssl.com"
@ -158,6 +151,7 @@ exit:
} }
} }
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void https_get_request_using_crt_bundle(void) static void https_get_request_using_crt_bundle(void)
{ {
ESP_LOGI(TAG, "https_request using crt bundle"); ESP_LOGI(TAG, "https_request using crt bundle");
@ -166,8 +160,7 @@ static void https_get_request_using_crt_bundle(void)
}; };
https_get_request(cfg, WEB_URL, HOWSMYSSL_REQUEST); https_get_request(cfg, WEB_URL, HOWSMYSSL_REQUEST);
} }
#endif // CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
static void https_get_request_using_cacert_buf(void) static void https_get_request_using_cacert_buf(void)
{ {
@ -247,7 +240,9 @@ static void https_request_task(void *pvparameters)
https_get_request_using_already_saved_session(server_url); https_get_request_using_already_saved_session(server_url);
#endif #endif
#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
https_get_request_using_crt_bundle(); https_get_request_using_crt_bundle();
#endif
printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size()); printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size());
https_get_request_using_cacert_buf(); https_get_request_using_cacert_buf();
https_get_request_using_global_ca_store(); https_get_request_using_global_ca_store();