arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-14 13:41:23 +03:00
Code Activity

Update axTLS to fe4518d, SNI support in WiFiClientSecure (#1285)

Browse Source 
Fixes #1933
This commit is contained in:
Ivan Grokhotkov
2016-04-19 08:29:13 +03:00
parent b7c23c79de
commit 8c65f2fcd0
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
View File

@ -93,8 +93,8 @@ public:
}
}
void connect(ClientContext* ctx, uint32_t timeout_ms) {
_ssl = ssl_client_new(_ssl_ctx, reinterpret_cast<int>(ctx), nullptr, 0);
void connect(ClientContext* ctx, const char* hostName, uint32_t timeout_ms) {
_ssl = ssl_client_new(_ssl_ctx, reinterpret_cast<int>(ctx), nullptr, 0, hostName);
uint32_t t = millis();
while (millis() - t < timeout_ms && ssl_handshake_status(_ssl) != SSL_OK) {
@ -242,16 +242,21 @@ int WiFiClientSecure::connect(IPAddress ip, uint16_t port) {
if (!WiFiClient::connect(ip, port))
return 0;
return _connectSSL();
return _connectSSL(nullptr);
}
int WiFiClientSecure::connect(const char* name, uint16_t port) {
if (!WiFiClient::connect(name, port))
IPAddress remote_addr;
if (!WiFi.hostByName(name, remote_addr)) {
return 0;
return 1;
}
if (!WiFiClient::connect(remote_addr, port)) {
return 0;
}
return _connectSSL(name);
}
int WiFiClientSecure::_connectSSL() {
int WiFiClientSecure::_connectSSL(const char* hostName) {
if (_ssl) {
_ssl->unref();
_ssl = nullptr;
@ -259,7 +264,7 @@ int WiFiClientSecure::_connectSSL() {
_ssl = new SSLContext;
_ssl->ref();
_ssl->connect(_client, 5000);
_ssl->connect(_client, hostName, 5000);
auto status = ssl_handshake_status(*_ssl);
if (status != SSL_OK) {