arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Return data in internal SSL buffers after close (#4756)

Browse Source 
When the TCP socket is closed there may be some data left in the
BearSSL internal buffers which can be read by the application.

The BearSSL pump, however, would always return no data available
in the case the socket was disconnected before checking if the
SSL was in a state where the app could possibly read.

Fix by returning if the state is available, even if the connection
is gone.  Eventually no more data will become available to read
and the original -1 will be returned.

This should match the existing axTLS ::connected() behavior.
This commit is contained in:
Earle F. Philhower, III 2018-05-23 08:24:34 -07:00 committed by GitHub
parent 9b5f3c2882
commit 529baabef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View File

@ -228,8 +228,7 @@ bool WiFiClientSecure::_clientConnected() {
}
uint8_t WiFiClientSecure::connected() {
if (WiFiClient::connected() || available() ||
(_clientConnected() && _handshake_done)) {
if (available() || (_clientConnected() && _handshake_done)) {
return true;
}
return false;
@ -398,7 +397,7 @@ int WiFiClientSecure::_run_until(unsigned target, bool blocking) {
}
if (!(_client->state() == ESTABLISHED) && !WiFiClient::available()) {
return -1;
return (state & target) ? 0 : -1;
}
/*