Explorar o código

Merge branch 'bugfix/coap_mbedtls_add_define_check_for_apln' into 'master'

ESP32/coap_mbedtls:add macro checks

See merge request espressif/esp-idf!6262
Mahavir Jain %!s(int64=6) %!d(string=hai) anos
pai
achega
262b1c9f65
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      components/coap/port/coap_mbedtls.c

+ 2 - 2
components/coap/port/coap_mbedtls.c

@@ -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);
     }