WiFiClientSecure: don't decrypt when testing for 'connected'

igrr · igrr · commit a6922dc0ec72 · 2017-12-26T11:46:16.000+08:00
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
@@ -193,6 +193,12 @@ class SSLContext
         return cb;
     }
 
+    // similar to availble, but doesn't return exact size
+    bool hasData()
+    {
+        return _available > 0 || (s_io_ctx && s_io_ctx->getSize() > 0);
+    }
+
     bool loadObject(int type, Stream& stream, size_t size)
     {
         std::unique_ptr<uint8_t[]> buf(new uint8_t[size]);
@@ -458,7 +464,7 @@ err     x       N           N
 uint8_t WiFiClientSecure::connected()
 {
     if (_ssl) {
-        if (_ssl->available()) {
+        if (_ssl->hasData()) {
             return true;
         }
         if (_client && _client->state() == ESTABLISHED && _ssl->connected()) {

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,12 @@ class SSLContext`
`193`	`193`	`return cb;`
`194`	`194`	`}`
`195`	`195`
	`196`	`+ // similar to availble, but doesn't return exact size`
	`197`	`+ bool hasData()`
	`198`	`+ {`
	`199`	`+ return _available > 0 \|\| (s_io_ctx && s_io_ctx->getSize() > 0);`
	`200`	`+ }`
	`201`	`+`
`196`	`202`	`bool loadObject(int type, Stream& stream, size_t size)`
`197`	`203`	`{`
`198`	`204`	`std::unique_ptr<uint8_t[]> buf(new uint8_t[size]);`
`@@ -458,7 +464,7 @@ err x N N`
`458`	`464`	`uint8_t WiFiClientSecure::connected()`
`459`	`465`	`{`
`460`	`466`	`if (_ssl) {`
`461`		`- if (_ssl->available()) {`
	`467`	`+ if (_ssl->hasData()) {`
`462`	`468`	`return true;`
`463`	`469`	`}`
`464`	`470`	`if (_client && _client->state() == ESTABLISHED && _ssl->connected()) {`