From 1aa017a0952b88994badfe4fcb98dd3cdadb59ea Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sat, 23 Oct 2021 17:46:52 +0200 Subject: [PATCH 1/2] Roll back from #13435 --- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp | 3 ++- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index 13324ed2b..a5b32f7f2 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -303,7 +303,7 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout } return _connectSSL(nullptr); } -#endif // ESP32 +#else // ESP32 int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port); clearLastError(); @@ -313,6 +313,7 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { } return _connectSSL(nullptr); } +#endif #ifdef ESP32 int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t timeout) { diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h index 77fea817c..1f97626a1 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -41,10 +41,11 @@ class WiFiClientSecure_light : public WiFiClient { #ifdef ESP32 // the method to override in ESP32 has timeout argument int connect(IPAddress ip, uint16_t port, int32_t timeout) override; int connect(const char* name, uint16_t port, int32_t timeout) override; - #endif + #else int connect(IPAddress ip, uint16_t port) override; int connect(const char* name, uint16_t port) override; - + #endif + uint8_t connected() override; size_t write(const uint8_t *buf, size_t size) override; #ifdef ESP8266 From 03a3dd481ef4ee667da3b12f3f055363c92ce2a5 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sat, 23 Oct 2021 17:50:12 +0200 Subject: [PATCH 2/2] Missed one --- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index a5b32f7f2..ff87d3112 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -334,7 +334,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t tim LOG_HEAP_SIZE("Before calling _connectSSL"); return _connectSSL(name); } -#endif // ESP32 +#else // ESP32 int WiFiClientSecure_light::connect(const char* name, uint16_t port) { DEBUG_BSSL("connect(%s,%d)\n", name, port); IPAddress remote_addr; @@ -353,6 +353,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port) { LOG_HEAP_SIZE("Before calling _connectSSL"); return _connectSSL(name); } +#endif void WiFiClientSecure_light::_freeSSL() { _ctx_present = false;