Merge branch 'bugfix/fix_use_wolfssl_build_error' into 'master'

donghengqaz · donghengqaz · commit ffa9749d65e0 · 2020-03-31T13:37:46.000+08:00
fix(tls): wolfSSL_set_tlsext_host_name function not support in wolfssl lib in...

See merge request sdk/ESP8266_RTOS_SDK!1348
diff --git a/components/esp-tls/esp_tls_wolfssl.c b/components/esp-tls/esp_tls_wolfssl.c
@@ -231,6 +231,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls
     }
 
     if (!cfg->skip_common_name) {
+#ifdef HAVE_SNI
         char *use_host = NULL;
         if (cfg->common_name != NULL) {
             use_host = strdup(cfg->common_name);
@@ -248,6 +249,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls
             return ESP_ERR_WOLFSSL_SSL_SET_HOSTNAME_FAILED;
         }
         free(use_host);
+#endif /* HAVE_SNI */
     }
 
     if (cfg->alpn_protos) {

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`if (!cfg->skip_common_name) {`
	`234`	`+#ifdef HAVE_SNI`
`234`	`235`	`char *use_host = NULL;`
`235`	`236`	`if (cfg->common_name != NULL) {`
`236`	`237`	`use_host = strdup(cfg->common_name);`
`@@ -248,6 +249,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls`
`248`	`249`	`return ESP_ERR_WOLFSSL_SSL_SET_HOSTNAME_FAILED;`
`249`	`250`	`}`
`250`	`251`	`free(use_host);`
	`252`	`+#endif /* HAVE_SNI */`
`251`	`253`	`}`
`252`	`254`
`253`	`255`	`if (cfg->alpn_protos) {`