arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

Fix regression in WiFiClientSecure, update HTTPS test case (#2150)

Browse Source
This commit is contained in:
Ivan Grokhotkov
2016-06-15 11:49:51 +08:00
parent da17d5425a
commit e64e32b329
3 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ static int s_pk_refcnt = 0;
uint8_t* default_certificate = 0;
uint32_t default_certificate_len = 0;
static bool default_certificate_dynamic = false;
static ClientContext* s_io_ctx = nullptr;
static void clear_private_key();
static void clear_certificate();
@ -82,6 +81,8 @@ public:
if (_ssl_ctx_refcnt == 0) {
ssl_ctx_free(_ssl_ctx);
}
s_io_ctx = nullptr;
}
void ref() {
@ -95,6 +96,7 @@ public:
}
void connect(ClientContext* ctx, const char* hostName, uint32_t timeout_ms) {
s_io_ctx = ctx;
_ssl = ssl_client_new(_ssl_ctx, 0, nullptr, 0, hostName);
uint32_t t = millis();
@ -107,6 +109,10 @@ public:
}
}
void stop() {
s_io_ctx = nullptr;
}
bool connected() {
return _ssl != nullptr && ssl_handshake_status(_ssl) == SSL_OK;
}
@ -173,6 +179,10 @@ public:
return _ssl;
}
static ClientContext* getIOContext(int fd) {
return s_io_ctx;
}
protected:
int _readAll() {
if (!_ssl)
@ -201,18 +211,18 @@ protected:
int _refcnt = 0;
const uint8_t* _read_ptr = nullptr;
size_t _available = 0;
static ClientContext* s_io_ctx;
};
SSL_CTX* SSLContext::_ssl_ctx = nullptr;
int SSLContext::_ssl_ctx_refcnt = 0;
ClientContext* SSLContext::s_io_ctx = nullptr;
WiFiClientSecure::WiFiClientSecure() {
++s_pk_refcnt;
}
WiFiClientSecure::~WiFiClientSecure() {
s_io_ctx = nullptr;
if (_ssl) {
_ssl->unref();
}
@ -264,8 +274,6 @@ int WiFiClientSecure::_connectSSL(const char* hostName) {
_ssl = nullptr;
}
s_io_ctx = _client;
_ssl = new SSLContext;
_ssl->ref();
_ssl->connect(_client, hostName, 5000);
@ -371,7 +379,9 @@ uint8_t WiFiClientSecure::connected() {
}
void WiFiClientSecure::stop() {
s_io_ctx = nullptr;
if (_ssl) {
_ssl->stop();
}
WiFiClient::stop();
}
@ -525,7 +535,7 @@ static void clear_certificate() {
}
extern "C" int ax_port_read(int fd, uint8_t* buffer, size_t count) {
ClientContext* _client = s_io_ctx;
ClientContext* _client = SSLContext::getIOContext(fd);
if (!_client || _client->state() != ESTABLISHED && !_client->getSize()) {
errno = EIO;
return -1;
@ -542,7 +552,7 @@ extern "C" int ax_port_read(int fd, uint8_t* buffer, size_t count) {
}
extern "C" int ax_port_write(int fd, uint8_t* buffer, size_t count) {
ClientContext* _client = s_io_ctx;
ClientContext* _client = SSLContext::getIOContext(fd);
if (!_client || _client->state() != ESTABLISHED) {
errno = EIO;
return -1;