update esp32 ethernet to use native Arduino WiFiClientSecure

Author: alvarolb

src/ThingerESP32Eth.h

@@ -7,11 +7,13 @@
 
 #include <ETH.h>
 #include <ThingerClient.h>
-#include <functional>
 
-#ifndef _DISABLE_TLS_
-#include <SSLClientESP32.h>
-#endif 
+#ifdef _DISABLE_TLS_
+typedef WiFiClient ESP32Client;
+#else
+#include <WiFiClientSecure.h>
+typedef WiFiClientSecure ESP32Client;
+#endif
 
 class ThingerESP32Eth : public ThingerClient
 
@@ -25,15 +27,8 @@ class ThingerESP32Eth : public ThingerClient
             ThingerClient(client_, user, device, device_credential)
             #ifdef THINGER_FREE_RTOS
             ,ThingerESP32FreeRTOS(static_cast<ThingerClient&>(*this))
-            #endif,
-            #ifndef _DISABLE_TLS_
-            ,client_(&base_client_)
             #endif
     {
-        
-        #ifndef _DISABLE_TLS_
-            client_.setCACert(CA_ROOT_CERTIFICATE);
-        #endif   
 
          WiFi.onEvent([](WiFiEvent_t event){
             switch (event) {
@@ -79,10 +74,6 @@ class ThingerESP32Eth : public ThingerClient
 
 protected:
 
-    virtual bool network_connected(){
-        return initialized_ ? ETH.linkUp() : false;
-    }
-
     bool init_address(){
         if(ip_==nullptr) return true;
         bool result = true;
@@ -93,9 +84,30 @@ class ThingerESP32Eth : public ThingerClient
         result &= dns1.fromString(dns1_);
         result &= dns2.fromString(dns2_);
         return result && ETH.config(ip, gateway, subnet, dns1, dns2);
-    } 
+    }
+
+    virtual bool network_connected() override{
+        return initialized_ ? ETH.linkUp() : false;
+    }
 
-    virtual bool connect_network(){
+#ifndef _DISABLE_TLS_
+    bool connect_socket() override{
+
+#ifdef THINGER_INSECURE_SSL
+        client_.setInsecure();
+        THINGER_DEBUG("SSL/TLS", "Warning: TLS/SSL certificate will not be checked!")
+#else
+        client_.setCACert(get_root_ca());
+#endif
+        return client_.connect(get_host(), THINGER_SSL_PORT);
+    }
+
+    bool secure_connection() override{
+        return true;
+    }
+#endif
+
+    bool connect_network() override{
         if(!initialized_){
             initialized_ = ETH.begin();
             if(initialized_){
@@ -108,20 +120,14 @@ class ThingerESP32Eth : public ThingerClient
         return network_connected();
     }
 
-#ifndef _DISABLE_TLS_
-    WiFiClient base_client_;
-    SSLClientESP32 client_;
-#else
-    WiFiClient client_;
-#endif
+    ESP32Client client_;
     bool initialized_       = false;
     const char* hostname_   = "esp32-thinger";
     const char* ip_         = nullptr;
     const char* gateway_    = nullptr;
     const char* subnet_     = nullptr;
     const char* dns1_       = nullptr;
     const char* dns2_       = nullptr;
-      
 };
 
 #endif