mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13435 from Leo-PL/fix_bearssl_connect_esp32 

BearSSL: support connect() without timeout on ESP32
This commit is contained in:
Theo Arends 2021-10-22 09:33:49 +02:00 committed by GitHub
parent 1360d68540 b5730a9be9
commit e6cc6dfcd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp
View File

@ -303,7 +303,7 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout
} }
return _connectSSL(nullptr); return _connectSSL(nullptr);
} }
#else // ESP32 #endif // ESP32
int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) {
DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port); DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port);
clearLastError(); clearLastError();
@ -313,7 +313,6 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) {
} }
return _connectSSL(nullptr); return _connectSSL(nullptr);
} }
#endif
#ifdef ESP32 #ifdef ESP32
int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t timeout) { int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t timeout) {
@ -334,7 +333,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t tim
LOG_HEAP_SIZE("Before calling _connectSSL"); LOG_HEAP_SIZE("Before calling _connectSSL");
return _connectSSL(name); return _connectSSL(name);
} }
#else // ESP32 #endif // ESP32
int WiFiClientSecure_light::connect(const char* name, uint16_t port) { int WiFiClientSecure_light::connect(const char* name, uint16_t port) {
DEBUG_BSSL("connect(%s,%d)\n", name, port); DEBUG_BSSL("connect(%s,%d)\n", name, port);
IPAddress remote_addr; IPAddress remote_addr;
@ -353,7 +352,6 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port) {
LOG_HEAP_SIZE("Before calling _connectSSL"); LOG_HEAP_SIZE("Before calling _connectSSL");
return _connectSSL(name); return _connectSSL(name);
} }
#endif
void WiFiClientSecure_light::_freeSSL() { void WiFiClientSecure_light::_freeSSL() {
_ctx_present = false; _ctx_present = false;

3
lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h
View File

@ -41,10 +41,9 @@ class WiFiClientSecure_light : public WiFiClient {
#ifdef ESP32 // the method to override in ESP32 has timeout argument #ifdef ESP32 // the method to override in ESP32 has timeout argument
int connect(IPAddress ip, uint16_t port, int32_t timeout) override; int connect(IPAddress ip, uint16_t port, int32_t timeout) override;
int connect(const char* name, uint16_t port, int32_t timeout) override; int connect(const char* name, uint16_t port, int32_t timeout) override;
#else #endif
int connect(IPAddress ip, uint16_t port) override; int connect(IPAddress ip, uint16_t port) override;
int connect(const char* name, uint16_t port) override; int connect(const char* name, uint16_t port) override;
#endif
uint8_t connected() override; uint8_t connected() override;
size_t write(const uint8_t *buf, size_t size) override; size_t write(const uint8_t *buf, size_t size) override;