SNI support (espressif#592)

Server Name Indication (SNI) support for WiFiClientSecure Fixespressif#571 and espressif#550

Author: copercini

libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

@@ -97,7 +97,12 @@ int WiFiClientSecure::connect(const char *host, uint16_t port)
 
 intWiFiClientSecure::connect(IPAddress ip, uint16_t port, constchar *_CA_cert, constchar *_cert, constchar *_private_key)
 {
-int ret = start_ssl_client(sslclient, ip, port, _CA_cert, _cert, _private_key);
+returnconnect(ip.toString().c_str(), port, _CA_cert, _cert, _private_key);
+}
+
+intWiFiClientSecure::connect(constchar *host, uint16_t port, constchar *_CA_cert, constchar *_cert, constchar *_private_key)
+{
+int ret = start_ssl_client(sslclient, host, port, _CA_cert, _cert, _private_key);
 if (ret < 0){
 log_e("lwip_connect_r: %d", errno);
 stop();
@@ -107,18 +112,6 @@ int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *_CA_cert,
 return1;
 }
 
-intWiFiClientSecure::connect(constchar *host, uint16_t port, constchar *_CA_cert, constchar *_cert, constchar *_private_key)
-{
-structhostent *server;
- server = gethostbyname(host);
-if (server == NULL){
-return0;
- }
- IPAddress srv((constuint8_t *)(server->h_addr));
-returnconnect(srv, port, _CA_cert, _cert, _private_key);
-}
-
-
 size_tWiFiClientSecure::write(uint8_t data)
 {
 returnwrite(&data, 1);

libraries/WiFiClientSecure/src/ssl_client.cpp

@@ -37,7 +37,7 @@ void ssl_init(sslclient_context *ssl_client)
 }
 
 
-intstart_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t port, constchar *rootCABuff, constchar *cli_cert, constchar *cli_key)
+intstart_ssl_client(sslclient_context *ssl_client, constchar *host, uint32_t port, constchar *rootCABuff, constchar *cli_cert, constchar *cli_key)
 {
 char buf[512];
 int ret, flags, len, timeout;
@@ -53,10 +53,17 @@ int start_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t
 return ssl_client->socket;
  }
 
+structhostent *server;
+ server = gethostbyname(host);
+if (server == NULL){
+return0;
+ }
+ IPAddress srv((constuint8_t *)(server->h_addr));
+
 structsockaddr_in serv_addr;
 memset(&serv_addr, 0, sizeof(serv_addr));
  serv_addr.sin_family = AF_INET;
- serv_addr.sin_addr.s_addr = ipAddress;
+ serv_addr.sin_addr.s_addr = srv;
  serv_addr.sin_port = htons(port);
 
 if (lwip_connect(ssl_client->socket, (structsockaddr *)&serv_addr, sizeof(serv_addr)) == 0){
@@ -90,9 +97,9 @@ int start_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t
 returnhandle_error(ret);
  }
 
-/* MBEDTLS_SSL_VERIFY_REQUIRED if a CA certificate is defined on Arduino IDE and
- MBEDTLS_SSL_VERIFY_NONE if not.
-*/
+// MBEDTLS_SSL_VERIFY_REQUIRED if a CA certificate is defined on Arduino IDE and
+// MBEDTLS_SSL_VERIFY_NONE if not.
+
 if (rootCABuff != NULL){
 log_i("Loading CA cert");
 mbedtls_x509_crt_init(&ssl_client->ca_cert);
@@ -129,18 +136,12 @@ int start_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t
 mbedtls_ssl_conf_own_cert(&ssl_client->ssl_conf, &ssl_client->client_cert, &ssl_client->client_key);
  }
 
-/*
- // TODO: implement match CN verification
+log_i("Setting hostname for TLS session...");
 
- log_i("Setting hostname for TLS session...");
-
- // Hostname set here should match CN in server certificate
- if((ret = mbedtls_ssl_set_hostname(&ssl_client->ssl_ctx, host)) != 0)
-{
- return handle_error(ret);
-
- }
-*/
+// Hostname set here should match CN in server certificate
+if((ret = mbedtls_ssl_set_hostname(&ssl_client->ssl_ctx, host)) != 0){
+returnhandle_error(ret);
+ }
 
 mbedtls_ssl_conf_rng(&ssl_client->ssl_conf, mbedtls_ctr_drbg_random, &ssl_client->drbg_ctx);
 
@@ -221,7 +222,7 @@ int data_to_read(sslclient_context *ssl_client)
  ret = mbedtls_ssl_read(&ssl_client->ssl_ctx, NULL, 0);
 //log_e("RET: %i",ret); //for low level debug
  res = mbedtls_ssl_get_bytes_avail(&ssl_client->ssl_ctx);
-//log_e("RES: %i",res);
+//log_e("RES: %i",res); //for low level debug
 if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret < 0){
 returnhandle_error(ret);
  }

libraries/WiFiClientSecure/src/ssl_client.h

@@ -27,7 +27,7 @@ typedef struct sslclient_context{
 
 
 voidssl_init(sslclient_context*ssl_client);
-intstart_ssl_client(sslclient_context*ssl_client, uint32_tipAddress, uint32_tport, constchar*rootCABuff, constchar*cli_cert, constchar*cli_key);
+intstart_ssl_client(sslclient_context*ssl_client, constchar*host, uint32_tport, constchar*rootCABuff, constchar*cli_cert, constchar*cli_key);
 voidstop_ssl_socket(sslclient_context*ssl_client, constchar*rootCABuff, constchar*cli_cert, constchar*cli_key);
 intdata_to_read(sslclient_context*ssl_client);
 intsend_ssl_data(sslclient_context*ssl_client, constuint8_t*data, uint16_tlen);