Skip to content

Commit f59e47d

Browse files
authored
Merge pull request xreef#43 from Patriboom/master
With Andy2015 s all modifications
2 parents 87a411f + cddc6d3 commit f59e47d

File tree

1 file changed

+33
-6
lines changed

1 file changed

+33
-6
lines changed

EMailSender.h

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,11 @@
128128
#include <WiFi.h>
129129
#include <WiFiClientSecure.h>
130130

131-
#define EMAIL_NETWORK_CLASS WiFiClient
131+
#ifndef FORCE_DISABLE_SSL
132+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
133+
#else
134+
#define EMAIL_NETWORK_CLASS WiFiClient
135+
#endif
132136
#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
133137
#define EMAIL_NETWORK_SERVER_CLASS WiFiServer
134138

@@ -154,7 +158,11 @@
154158
#else
155159
#include <ESP31BWiFi.h>
156160
#endif
157-
#define EMAIL_NETWORK_CLASS WiFiClient
161+
#ifndef FORCE_DISABLE_SSL
162+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
163+
#else
164+
#define EMAIL_NETWORK_CLASS WiFiClient
165+
#endif
158166
#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
159167
#define EMAIL_NETWORK_SERVER_CLASS WiFiServer
160168

@@ -190,14 +198,22 @@
190198

191199
#include <WiFi.h>
192200
#include <WiFiClientSecure.h>
193-
#define EMAIL_NETWORK_CLASS WiFiClient
201+
#ifndef FORCE_DISABLE_SSL
202+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
203+
#else
204+
#define EMAIL_NETWORK_CLASS WiFiClient
205+
#endif
194206
#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
195207
#define EMAIL_NETWORK_SERVER_CLASS WiFiServer
196208

197209
#elif(EMAIL_NETWORK_TYPE == NETWORK_ESP32_ETH)
198210

199211
#include <ETH.h>
200-
#define EMAIL_NETWORK_CLASS WiFiClient
212+
#ifndef FORCE_DISABLE_SSL
213+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
214+
#else
215+
#define EMAIL_NETWORK_CLASS WiFiClient
216+
#endif
201217
#define EMAIL_NETWORK_SERVER_CLASS WiFiServer
202218

203219
#elif(EMAIL_NETWORK_TYPE == NETWORK_ETHERNET_LARGE)
@@ -224,7 +240,11 @@
224240
#elif(EMAIL_NETWORK_TYPE == NETWORK_WiFiNINA)
225241

226242
#include <WiFiNINA.h>
227-
#define EMAIL_NETWORK_CLASS WiFiClient
243+
#ifndef FORCE_DISABLE_SSL
244+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
245+
#else
246+
#define EMAIL_NETWORK_CLASS WiFiClient
247+
#endif
228248
#define EMAIL_NETWORK_SSL_CLASS WiFiSSLClient
229249
#define EMAIL_NETWORK_SERVER_CLASS WiFiServer
230250

@@ -321,7 +341,9 @@
321341

322342
#ifdef EMAIL_NETWORK_SSL_CLASS
323343
#ifndef FORCE_DISABLE_SSL
324-
#define EMAIL_NETWORK_CLASS EMAIL_NETWORK_SSL_CLASS
344+
#define EMAIL_NETWORK_CLASS WiFiClientSecure
345+
#else
346+
#define EMAIL_NETWORK_CLASS WiFiClient
325347
#endif
326348
#endif
327349

@@ -337,6 +359,11 @@
337359
#define DEBUG_PRINTLN(...) {}
338360
#endif
339361

362+
// Debug level for SSLClient
363+
#ifndef EMAIL_SENDER_SSL_CLIENT_DEBUG
364+
#define EMAIL_SENDER_SSL_CLIENT_DEBUG 2
365+
#endif
366+
340367
class EMailSender {
341368
public:
342369
EMailSender(const char* email_login, const char* email_password, const char* email_from, const char* name_from, const char* smtp_server, uint16_t smtp_port );

0 commit comments

Comments
 (0)