]> granicus.if.org Git - esp-idf/commitdiff
ESP32/coap_mbedtls:add macro checks
authorAditya Patwardhan <aditya.patwardhan@espressif.com>
Wed, 9 Oct 2019 08:46:46 +0000 (16:46 +0800)
committerMahavir Jain <mahavir@espressif.com>
Wed, 9 Oct 2019 08:46:46 +0000 (16:46 +0800)
Closes https://github.com/espressif/esp-idf/issues/4156

components/coap/port/coap_mbedtls.c

index 4d616e90985f029e82b53515d55298926e403c11..1727dac67e9cf967e1f93a0eab4fc98a68206c97 100644 (file)
@@ -1048,7 +1048,7 @@ static int setup_client_ssl_session(coap_session_t *c_session,
       coap_log(LOG_ERR, "PKI setup failed\n");
       return ret;
     }
-#if !defined(ESPIDF_VERSION) || defined(CONFIG_MBEDTLS_TLS_SERVER)
+#if !defined(ESPIDF_VERSION) ||(defined(CONFIG_MBEDTLS_TLS_SERVER) && defined(CONFIG_MBEDTLS_SSL_ALPN))
     if (c_session->proto == COAP_PROTO_TLS) {
       const char *alpn_list[2];
 
@@ -1059,7 +1059,7 @@ static int setup_client_ssl_session(coap_session_t *c_session,
         coap_log(LOG_ERR, "ALPN setup failed %d)\n", ret);
       }
     }
-#endif /* !ESPIDF_VERSION || CONFIG_MBEDTLS_TLS_SERVER */
+#endif /* !ESPIDF_VERSION || (CONFIG_MBEDTLS_TLS_SERVER && CONFIG_MBEDTLS_SSL_ALPN) */
     if (m_context->setup_data.client_sni) {
       mbedtls_ssl_set_hostname(&m_env->ssl, m_context->setup_data.client_sni);
     }