Fix code of warnings #43

xreef · Oct 31, 2023 · 0d0926f · 0d0926f
1 parent a3eea2e
commit 0d0926f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/EMailSender.cpp b/EMailSender.cpp
@@ -2,7 +2,7 @@
  * EMail Sender Arduino, esp8266, stm32 and esp32 library to send email
  *
  * AUTHOR:  Renzo Mischianti
- * VERSION: 3.0.12
+ * VERSION: 3.0.13
  *
  * https://www.mischianti.org/
  *

diff --git a/EMailSender.h b/EMailSender.h
@@ -2,7 +2,7 @@
  * EMail Sender Arduino, esp8266, stm32 and esp32 library to send email
  *
  * AUTHOR:  Renzo Mischianti
- * VERSION: 3.0.12
+ * VERSION: 3.0.13
  *
  * https://www.mischianti.org/
  *
@@ -133,7 +133,7 @@
 #else
     #define EMAIL_NETWORK_CLASS WiFiClient
 #endif
-#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
+//#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
 #define EMAIL_NETWORK_SERVER_CLASS WiFiServer
 
 #elif defined(ESP31B)
@@ -163,7 +163,7 @@
 #else
     #define EMAIL_NETWORK_CLASS WiFiClient
 #endif
-#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
+//#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
 #define EMAIL_NETWORK_SERVER_CLASS WiFiServer
 
 #elif(EMAIL_NETWORK_TYPE == NETWORK_W5100 || EMAIL_NETWORK_TYPE == NETWORK_ETHERNET_ENC)
@@ -203,17 +203,13 @@
 #else
     #define EMAIL_NETWORK_CLASS WiFiClient
 #endif
-#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
+//#define EMAIL_NETWORK_SSL_CLASS WiFiClientSecure
 #define EMAIL_NETWORK_SERVER_CLASS WiFiServer
 
 #elif(EMAIL_NETWORK_TYPE == NETWORK_ESP32_ETH)
 
 #include <ETH.h>
-#ifndef FORCE_DISABLE_SSL
-	#define EMAIL_NETWORK_CLASS WiFiClientSecure
-#else
-    #define EMAIL_NETWORK_CLASS WiFiClient
-#endif
+#define EMAIL_NETWORK_CLASS WiFiClient
 #define EMAIL_NETWORK_SERVER_CLASS WiFiServer
 
 #elif(EMAIL_NETWORK_TYPE == NETWORK_ETHERNET_LARGE)
@@ -241,11 +237,11 @@
 
 #include <WiFiNINA.h>
 #ifndef FORCE_DISABLE_SSL
-	#define EMAIL_NETWORK_CLASS WiFiClientSecure
+	#define EMAIL_NETWORK_CLASS WiFiSSLClient
 #else
     #define EMAIL_NETWORK_CLASS WiFiClient
 #endif
-#define EMAIL_NETWORK_SSL_CLASS WiFiSSLClient
+//#define EMAIL_NETWORK_SSL_CLASS WiFiSSLClient
 #define EMAIL_NETWORK_SERVER_CLASS WiFiServer
 
 #else
@@ -339,13 +335,13 @@
 	#endif
 #endif
 
-#ifdef EMAIL_NETWORK_SSL_CLASS
-	#ifndef FORCE_DISABLE_SSL
-		#define EMAIL_NETWORK_CLASS WiFiClientSecure
-	#else
-	    #define EMAIL_NETWORK_CLASS WiFiClient
-	#endif
-#endif
+//#ifdef EMAIL_NETWORK_SSL_CLASS
+//	#ifndef FORCE_DISABLE_SSL
+//		#define EMAIL_NETWORK_CLASS WiFiClientSecure
+//	#else
+//	    #define EMAIL_NETWORK_CLASS WiFiClient
+//	#endif
+//#endif
 
 #define OPEN_CLOSE_INTERNAL
 #define OPEN_CLOSE_SD

diff --git a/EMailSenderKey.h b/EMailSenderKey.h
@@ -2,7 +2,7 @@
  * EMail Sender Arduino, esp8266, stm32 and esp32 library to send email
  *
  * AUTHOR:  Renzo Mischianti
- * VERSION: 3.0.12
+ * VERSION: 3.0.13
  *
  * https://www.mischianti.org/
  *

diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Arduino (support W5100 like must be set, and ENC28J60 via UIPEthernet), esp8266
 #### [Inviare email con allegati (libreria v2.x): esp32 e esp8266](https://www.mischianti.org/it/2020/06/16/inviare-email-con-allegati-libreria-v2-x-esp32-e-esp8266-part-2/)
 
 ## Change log
+ - 31/10/2023: v3.0.13 Fix wrong implementation of FORCE_DISABLE_SSL
  - 17/10/2023: v3.0.12 Fix warnigs of variable not used #43 thanks to @Patriboom @Andy2015
  - 16/02/2023: v3.0.11 Add support for Ethernet_Generic
  - 20/01/2023: v3.0.10 Add the management of ESP8266SdFat library on Raspberry Pi Pico [#forum](https://www.mischianti.org/forums/topic/raspberry-pico-w-emailsender)

diff --git a/library.json b/library.json
@@ -16,6 +16,6 @@
 	},
 	"url": "https://www.mischianti.org/category/my-libraries/emailsender-send-email-with-attachments/",
 	"frameworks": "Arduino",
-    "version": "3.0.12",
+    "version": "3.0.13",
 	"platforms": "*"
 }
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EMailSender
-version=3.0.12
+version=3.0.13
 author=Renzo Mischianti <[email protected]>
 maintainer=Renzo Mischianti <[email protected]>
 sentence=Send EMail via SMTP, library for Raspberry Pi Pico W, Arduino, SAMD (WiFiNINA), STM32, esp8266 and esp32.