Skip to content

Commit 554e29b

Browse files
added getNewSSLClient method
1 parent 03c4e2c commit 554e29b

11 files changed

+43
-2
lines changed

src/Arduino_CatM1ConnectionHandler.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,8 @@ NetworkConnectionState CatM1ConnectionHandler::update_handleDisconnected()
100100
}
101101
}
102102

103+
Client* CatM1ConnectionHandler::getNewSSLClient() {
104+
return new GSMSSLClient();
105+
}
106+
103107
#endif /* #ifdef BOARD_HAS_CATM1_NBIOT */

src/Arduino_CatM1ConnectionHandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class CatM1ConnectionHandler : public ConnectionHandler
4040

4141
virtual unsigned long getTime() override;
4242
virtual Client *getNewClient() override { return new GSMClient(); };
43+
virtual Client *getNewSSLClient() override;
4344
virtual Client & getClient() override { return _gsm_client; };
4445
virtual UDP & getUDP() override { return _gsm_udp; };
4546

src/Arduino_ConnectionHandler.h

+12-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
#include <Ethernet.h>
5858
#include <PortentaEthernet.h>
5959
#include <GSM.h>
60+
#include "EthernetSSLClient.h"
61+
#include <WiFiSSLClient.h>
6062

6163
#define BOARD_HAS_WIFI
6264
#define BOARD_HAS_ETHERNET
@@ -73,6 +75,8 @@
7375
#include <WiFiUdp.h>
7476
#include <EthernetC33.h>
7577
#include <EthernetUdp.h>
78+
#include "EthernetSSLClient.h"
79+
#include <WiFiSSLClient.h>
7680

7781
#define BOARD_HAS_WIFI
7882
#define BOARD_HAS_ETHERNET
@@ -85,6 +89,7 @@
8589
#if defined(ARDUINO_NICLA_VISION)
8690
#include <WiFi.h>
8791
#include <WiFiUdp.h>
92+
#include <WiFiSSLClient.h>
8893

8994
#define BOARD_HAS_WIFI
9095
#define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
@@ -97,6 +102,8 @@
97102
#include <WiFiUdp.h>
98103
#include <Ethernet.h>
99104
#include <PortentaEthernet.h>
105+
#include "EthernetSSLClient.h"
106+
#include <WiFiSSLClient.h>
100107

101108
#define BOARD_HAS_WIFI
102109
#define BOARD_HAS_ETHERNET
@@ -139,6 +146,7 @@
139146
#if defined(ARDUINO_ARCH_ESP8266)
140147
#include <ESP8266WiFi.h>
141148
#include <WiFiUdp.h>
149+
#include <WiFiClientSecure.h>
142150

143151
#define BOARD_HAS_WIFI
144152
#define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
@@ -150,7 +158,8 @@
150158
#if defined(ARDUINO_ARCH_ESP32)
151159
#include <WiFi.h>
152160
#include <WiFiUdp.h>
153-
161+
#include <WiFiClientSecure.h>
162+
154163
#define BOARD_HAS_WIFI
155164
#define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
156165
#define NETWORK_IDLE_STATUS WL_IDLE_STATUS
@@ -160,6 +169,7 @@
160169

161170
#if defined(ARDUINO_UNOR4_WIFI)
162171
#include <WiFiS3.h>
172+
#include <WiFiSSLClient.h>
163173

164174
#define BOARD_HAS_WIFI
165175
#define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
@@ -241,6 +251,7 @@ class ConnectionHandler {
241251
virtual unsigned long getTime() = 0;
242252
virtual Client &getClient() = 0;
243253
virtual Client *getNewClient() = 0;
254+
virtual Client *getNewSSLClient() = 0;
244255
virtual UDP &getUDP() = 0;
245256
#endif
246257

src/Arduino_EthernetConnectionHandler.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,8 @@ NetworkConnectionState EthernetConnectionHandler::update_handleDisconnected()
126126
}
127127
}
128128

129+
Client* EthernetConnectionHandler::getNewSSLClient() {
130+
return new EthernetSSLClient();
131+
}
132+
129133
#endif /* #ifdef BOARD_HAS_ETHERNET */

src/Arduino_EthernetConnectionHandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class EthernetConnectionHandler : public ConnectionHandler
3939
virtual unsigned long getTime() override { return 0; }
4040
virtual Client & getClient() override{ return _eth_client; }
4141
virtual Client *getNewClient() override { return new EthernetClient(); }
42+
virtual Client *getNewSSLClient() override;
4243
virtual UDP & getUDP() override { return _eth_udp; }
4344

4445

src/Arduino_GSMConnectionHandler.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,8 @@ NetworkConnectionState GSMConnectionHandler::update_handleDisconnected()
145145
}
146146
}
147147

148+
Client* GSMConnectionHandler::getNewSSLClient() {
149+
return new GSMSSLClient();
150+
}
151+
148152
#endif /* #ifdef BOARD_HAS_GSM */

src/Arduino_GSMConnectionHandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class GSMConnectionHandler : public ConnectionHandler
4141
virtual unsigned long getTime() override;
4242
virtual Client & getClient() override { return _gsm_client; };
4343
virtual Client *getNewClient() override { return new GSMClient(); }
44+
virtual Client *getNewSSLClient() override;
4445
virtual UDP & getUDP() override { return _gsm_udp; };
4546

4647

src/Arduino_NBConnectionHandler.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,8 @@ NetworkConnectionState NBConnectionHandler::update_handleDisconnected()
147147
}
148148
}
149149

150+
Client* NBConnectionHandler::getNewSSLClient() {
151+
return new NBSSLClient();
152+
}
153+
150154
#endif /* #ifdef BOARD_HAS_NB */

src/Arduino_NBConnectionHandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class NBConnectionHandler : public ConnectionHandler
4242
virtual unsigned long getTime() override;
4343
virtual Client & getClient() override { return _nb_client; };
4444
virtual Client *getNewClient() override { return new NBClient(); }
45+
virtual Client *getNewSSLClient() override;
4546
virtual UDP & getUDP() override { return _nb_udp; };
4647

4748

src/Arduino_WiFiConnectionHandler.cpp

+10-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
******************************************************************************/
2121

2222
#include "Arduino_WiFiConnectionHandler.h"
23-
2423
#ifdef BOARD_HAS_WIFI /* Only compile if the board has WiFi */
2524

2625
/******************************************************************************
@@ -170,4 +169,14 @@ NetworkConnectionState WiFiConnectionHandler::update_handleDisconnected()
170169
}
171170
}
172171

172+
Client* WiFiConnectionHandler::getNewSSLClient() {
173+
#ifdef ARDUINO_ARCH_ESP32
174+
return new WiFiClientSecure();
175+
#elif defined(ARDUINO_ARCH_ESP8266)
176+
return new WiFiClientSecure();
177+
#else
178+
return new WiFiSSLClient();
179+
#endif
180+
}
181+
173182
#endif /* #ifdef BOARD_HAS_WIFI */

src/Arduino_WiFiConnectionHandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class WiFiConnectionHandler : public ConnectionHandler
4040
virtual unsigned long getTime() override;
4141
virtual Client & getClient() override { return _wifi_client; }
4242
virtual Client *getNewClient() override { return new WiFiClient(); }
43+
virtual Client *getNewSSLClient() override;
4344
virtual UDP & getUDP() override { return _wifi_udp; }
4445

4546

0 commit comments

Comments
 (0)