Don't return true with WiFiClientSecureBearSSL::connected() when di…

…sconnected Apply the same condition as with normal WiFiClient - we are not connected when it's not possible to both write and read. Implement separate methods for actual connection status and the internal ssl engine status and update methods that were previously using available() for this purpose Update examples to check available() when the intent is to only read the data and not interact with the client in any other way. Also, use connect() as a way to notify errors, no need to check things twice

libraries/ESP8266WiFi/examples/BearSSL_CertStore/BearSSL_CertStore.ino

@@ -77,8 +77,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  }
 
  Serial.printf("Trying: %s:443...", host);
- client->connect(host, port);
- if (!client->connected()) {
+ if (!client->connect(host, port)) {
  Serial.printf("*** Can't connect. ***\n-------\n");
  return;
  }
@@ -90,7 +89,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  client->write("\r\nUser-Agent: ESP8266\r\n");
  client->write("\r\n");
  uint32_t to = millis() + 5000;
- if (client->connected()) {
+ while (client->available()) {
  do {
  char tmp[32];
  memset(tmp, 0, 32);

libraries/ESP8266WiFi/examples/BearSSL_MaxFragmentLength/BearSSL_MaxFragmentLength.ino

@@ -46,8 +46,7 @@ int fetchNoMaxFragmentLength() {
 
  BearSSL::WiFiClientSecure client;
  client.setInsecure();
- client.connect("tls.mbed.org", 443);
- if (client.connected()) {
+ if (client.connect("tls.mbed.org", 443)) {
  Serial.printf("Memory used: %d\n", ret - ESP.getFreeHeap());
  ret -= ESP.getFreeHeap();
  fetch(&client);
@@ -85,8 +84,7 @@ int fetchMaxFragmentLength() {
  if (mfln) {
  client.setBufferSizes(512, 512);
  }
- client.connect("tls.mbed.org", 443);
- if (client.connected()) {
+ if (client.connect("tls.mbed.org", 443)) {
  Serial.printf("MFLN status: %s\n", client.getMFLNStatus() ? "true" : "false");
  Serial.printf("Memory used: %d\n", ret - ESP.getFreeHeap());
  ret -= ESP.getFreeHeap();

libraries/ESP8266WiFi/examples/BearSSL_Sessions/BearSSL_Sessions.ino

@@ -58,8 +58,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  }
 
  Serial.printf("Trying: %s:443...", host);
- client->connect(host, port);
- if (!client->connected()) {
+ if (!client->connect(host, port)) {
  Serial.printf("*** Can't connect. ***\n-------\n");
  return;
  }
@@ -71,7 +70,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  client->write("\r\nUser-Agent: ESP8266\r\n");
  client->write("\r\n");
  uint32_t to = millis() + 5000;
- if (client->connected()) {
+ while (client->available()) {
  do {
  char tmp[32];
  memset(tmp, 0, 32);

libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino

@@ -47,8 +47,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  ESP.resetFreeContStack();
  uint32_t freeStackStart = ESP.getFreeContStack();
  Serial.printf("Trying: %s:443...", host);
- client->connect(host, port);
- if (!client->connected()) {
+ if (!client->connect(host, port)) {
  Serial.printf("*** Can't connect. ***\n-------\n");
  return;
  }
@@ -60,7 +59,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
  client->write("\r\nUser-Agent: ESP8266\r\n");
  client->write("\r\n");
  uint32_t to = millis() + 5000;
- if (client->connected()) {
+ while (client->available()) {
  do {
  char tmp[32];
  memset(tmp, 0, 32);

libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino

@@ -80,7 +80,7 @@ void setup() {
  "Connection: close\r\n\r\n");
 
  Serial.println("Request sent");
- while (client.connected()) {
+ while (client.available()) {
  String line = client.readStringUntil('\n');
  if (line == "\r") {
  Serial.println("Headers received");

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -253,19 +253,24 @@ void WiFiClientSecureCtx::_freeSSL() {
 }
 
 bool WiFiClientSecureCtx::_clientConnected() {
- return (_client && _client->state() == ESTABLISHED);
+ return _client && (_client->state() == ESTABLISHED);
+}
+
+bool WiFiClientSecureCtx::_engineConnected() {
+ return _clientConnected() && _handshake_done && _eng && (br_ssl_engine_current_state(_eng) != BR_SSL_CLOSED);
 }
 
 uint8_t WiFiClientSecureCtx::connected() {
- if (available() || (_clientConnected() && _handshake_done && (br_ssl_engine_current_state(_eng) != BR_SSL_CLOSED))) {
- return true;
+ if (!_clientConnected()) {
+ return false;
  }
- return false;
+
+ return (available() || _engineConnected());
 }
 
 int WiFiClientSecureCtx::availableForWrite () {
- // code taken from ::_write()
- if (!connected() || !_handshake_done) {
+ // Can't write things when there's no connection or br_ssl engine is closed
+ if (!_engineConnected()) {
  return 0;
  }
  // Get BearSSL to a state where we can send
@@ -287,7 +292,7 @@ int WiFiClientSecureCtx::availableForWrite () {
 size_t WiFiClientSecureCtx::_write(const uint8_t *buf, size_t size, bool pmem) {
  size_t sent_bytes = 0;
 
- if (!connected() || !size || !_handshake_done) {
+ if (!size || !_engineConnected()) {
  return 0;
  }
 
@@ -334,10 +339,11 @@ size_t WiFiClientSecureCtx::write_P(PGM_P buf, size_t size) {
 }
 
 size_t WiFiClientSecureCtx::write(Stream& stream) {
- if (!connected() || !_handshake_done) {
- DEBUG_BSSL("write: Connect/handshake not completed yet\n");
+ if (!_engineConnected()) {
+ DEBUG_BSSL("write: no br_ssl engine to work with\n");
  return 0;
  }
+
  return stream.sendAll(this);
 }
 
@@ -346,12 +352,19 @@ int WiFiClientSecureCtx::read(uint8_t *buf, size_t size) {
  return -1;
  }
 
+ // will either check the internal buffer, or try to wait for some data
  int avail = available();
- bool conn = connected();
- if (!avail && conn) {
- return 0; // We're still connected, but nothing to read
+
+ // internal buffer might still be available for some time
+ bool engine = _engineConnected();
+
+ // we're still connected, but nothing to read
+ if (!avail && engine) {
+ return 0;
  }
- if (!avail && !conn) {
+
+ // or, available failed to assign the internal buffer and we are already disconnected
+ if (!avail && !engine) {
  DEBUG_BSSL("read: Not connected, none left available\n");
  return -1;
  }
@@ -366,10 +379,11 @@ int WiFiClientSecureCtx::read(uint8_t *buf, size_t size) {
  return to_copy;
  }
 
- if (!conn) {
+ if (!engine) {
  DEBUG_BSSL("read: Not connected\n");
  return -1;
  }
+
  return 0; // If we're connected, no error but no read.
 }
 
@@ -398,7 +412,7 @@ int WiFiClientSecureCtx::read() {
  return -1;
 }
 
-int WiFiClientSecureCtx::available() {
+int WiFiClientSecureCtx::_updateRecvBuffer() {
  if (_recvapp_buf) {
  return _recvapp_len; // Anything from last call?
  }
@@ -419,8 +433,12 @@ int WiFiClientSecureCtx::available() {
  return 0;
 }
 
+int WiFiClientSecureCtx::available() {
+ return _updateRecvBuffer();
+}
+
 int WiFiClientSecureCtx::peek() {
- if (!ctx_present() || !available()) {
+ if (!ctx_present() || !_updateRecvBuffer()) {
  DEBUG_BSSL("peek: Not connected, none left available\n");
  return -1;
  }

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h

@@ -185,10 +185,14 @@ class WiFiClientSecureCtx : public WiFiClient {
  uint32_t _tls_min;
  uint32_t _tls_max;
 
+ // Pending received data buffer, used internally & as available()
+ int _updateRecvBuffer();
  unsigned char *_recvapp_buf;
  size_t _recvapp_len;
 
  bool _clientConnected(); // Is the underlying socket alive?
+ bool _engineConnected(); // Are both socket and the bearssl engine alive?
+
  std::shared_ptr<unsigned char> _alloc_iobuf(size_t sz);
  void _freeSSL();
  int _run_until(unsigned target, bool blocking = true);