From 1b719805756f60140312f8e314f732c0a177f74f Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Tue, 7 Sep 2021 15:38:20 +0200
Subject: [PATCH] Config: Add error message if certbunde is not enabled

Merges https://github.com/espressif/esp-mqtt/pull/198
---
 mqtt_client.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mqtt_client.c b/mqtt_client.c
index e9ad126..f47e61c 100644
--- a/mqtt_client.c
+++ b/mqtt_client.c
@@ -204,15 +204,18 @@ static esp_err_t esp_mqtt_set_ssl_transport_properties(esp_transport_list_handle
 
     if (cfg->use_global_ca_store == true) {
         esp_transport_ssl_enable_global_ca_store(ssl);
-#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
     } else if (cfg->crt_bundle_attach != NULL) {
-  #ifdef MQTT_SUPPORTED_FEATURE_CERTIFICATE_BUNDLE
+#ifdef MQTT_SUPPORTED_FEATURE_CERTIFICATE_BUNDLE
+#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
         esp_transport_ssl_crt_bundle_attach(ssl, cfg->crt_bundle_attach);
-  #else
+#else
+        ESP_LOGE(TAG, "Certificate bundle is not enabled for mbedTLS in menuconfig");
+        goto esp_mqtt_set_transport_failed;
+#endif /* CONFIG_MBEDTLS_CERTIFICATE_BUNDLE */
+#else
         ESP_LOGE(TAG, "Certificate bundle feature is not available in IDF version %s", IDF_VER);
         goto esp_mqtt_set_transport_failed;
-  #endif
-#endif
+#endif /* MQTT_SUPPORTED_FEATURE_CERTIFICATE_BUNDLE */
     } else {
         ESP_OK_CHECK(TAG, esp_mqtt_set_cert_key_data(ssl, MQTT_SSL_DATA_API_CA_CERT, cfg->cacert_buf, cfg->cacert_bytes),
                      goto esp_mqtt_set_transport_failed);