Merge pull request #711 from LeeLeahy2/ssl-client

Add SSLClientESP32 support to the network layer

Author: nseidle

.gitignore

@@ -56,3 +56,4 @@ NMEA_Client
 Read_Map_File
 RTK_Reset
 Split_Messages
+X.509_crt_bundle_bin_to_c

Firmware/RTK_Surveyor/NetworkClient.h

@@ -237,21 +237,28 @@ class NetworkClient : public Client
     //------------------------------
 
     friend class NetworkEthernetClient;
+    friend class NetworkEthernetSslClient;
     friend class NetworkWiFiClient;
+    friend class NetworkWiFiSslClient;
 };
 
 #ifdef  COMPILE_ETHERNET
 class NetworkEthernetClient : public NetworkClient
 {
   private:
 
-    EthernetClient _client;
+    EthernetClient _ethernetClient;
 
   public:
 
+    NetworkEthernetClient() :
+        NetworkClient(&_ethernetClient, NETWORK_TYPE_ETHERNET)
+    {
+    }
+
     NetworkEthernetClient(EthernetClient& client) :
-        _client{client},
-        NetworkClient(&_client, NETWORK_TYPE_ETHERNET)
+        _ethernetClient{client},
+        NetworkClient(&_ethernetClient, NETWORK_TYPE_ETHERNET)
     {
     }
 
@@ -260,17 +267,45 @@ class NetworkEthernetClient : public NetworkClient
         this->~NetworkClient();
     }
 };
+
+class NetworkEthernetSslClient : public NetworkClient
+{
+  protected:
+
+    EthernetClient _ethernetClient;
+    SSLClientESP32 _sslClient;
+
+  public:
+
+    NetworkEthernetSslClient() :
+        _sslClient(),
+        NetworkClient(&_sslClient, NETWORK_TYPE_ETHERNET)
+    {
+        _sslClient.setClient(&_ethernetClient);
+        _sslClient.setCACertBundle(x509CertificateBundle);
+    }
+
+    ~NetworkEthernetSslClient()
+    {
+        this->~NetworkClient();
+    }
+};
 #endif  // COMPILE_ETHERNET
 
 #ifdef  COMPILE_WIFI
 class NetworkWiFiClient : public NetworkClient
 {
-  private:
+  protected:
 
     WiFiClient _client;
 
   public:
 
+    NetworkWiFiClient() :
+        NetworkClient(&_client, NETWORK_TYPE_WIFI)
+    {
+    }
+
     NetworkWiFiClient(WiFiClient& client) :
         _client{client},
         NetworkClient(&_client, NETWORK_TYPE_WIFI)
@@ -282,6 +317,29 @@ class NetworkWiFiClient : public NetworkClient
         this->~NetworkClient();
     }
 };
+
+class NetworkWiFiSslClient : public NetworkClient
+{
+  protected:
+
+    WiFiClient _wifiClient;
+    SSLClientESP32 _sslClient;
+
+  public:
+
+    NetworkWiFiSslClient() :
+        _sslClient(),
+        NetworkClient(&_sslClient, NETWORK_TYPE_WIFI)
+    {
+        _sslClient.setClient(&_wifiClient);
+        _sslClient.setCACertBundle(x509CertificateBundle);
+    }
+
+    ~NetworkWiFiSslClient()
+    {
+        this->~NetworkClient();
+    }
+};
 #endif  // COMPILE_WIFI
 
 #endif  // __NETWORK_CLIENT_H__

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -201,6 +201,9 @@ char logFileName[sizeof("SFE_Reference_Station_230101_120101.ubx_plusExtraSpace"
 // Over-the-Air (OTA) update support
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+#include <SSLClientESP32.h> // http://librarymanager/All#SSLClientESP32
+#include "X509_Certificate_Bundle.h" // Root certificates
+
 #include "esp_ota_ops.h" //Needed for partition counting and updateFromSD
 
 #ifdef COMPILE_WIFI