Fix issue #367 for compilation error in ESP32 Core v3.1.x

mobizt · Dec 5, 2024 · 5861f02 · 5861f02
1 parent be53cd9
commit 5861f02
Show file tree

Hide file tree

Showing 305 changed files with 350 additions and 630 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP Mail Client",
-  "version": "3.4.22",
+  "version": "3.4.23",
   "keywords": "communication, email, imap, smtp, esp32, esp8266, samd, arduino",
   "description": "Arduino E-Mail Client Library to send, read and get incoming email notification for ESP32, ESP8266 and SAMD21 devices. The library also supported other Arduino Devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP Mail Client
 
-version=3.4.22
+version=3.4.23
 
 author=Mobizt
 

diff --git a/src/ESP_Mail_Client_Version.h b/src/ESP_Mail_Client_Version.h
@@ -3,8 +3,8 @@
 
 #ifndef ESP_MAIL_VERSION
 
-#define ESP_MAIL_VERSION "3.4.22"
-#define ESP_MAIL_VERSION_NUM 30422
+#define ESP_MAIL_VERSION "3.4.23"
+#define ESP_MAIL_VERSION_NUM 30423
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 //#define VALID_VERSION_CHECK(ver) (ver == ESP_MAIL_VERSION_NUM)

diff --git a/src/client/SSLClient/Custom_ESP_SSLClient_FS.h b/src/client/SSLClient/Custom_ESP_SSLClient_FS.h
diff --git a/src/client/SSLClient/ESP_SSLClient.h b/src/client/SSLClient/ESP_SSLClient.h
@@ -1,8 +1,8 @@
 /**
  *
- * The ESP SSL Client Class, ESP_SSLClient.h v2.1.7
+ * The ESP SSL Client Class, ESP_SSLClient.h v2.1.13
  *
- * Created September 2, 2023
+ * Created December 5, 2024
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -47,7 +47,7 @@ class ESP_SSLClient : public BSSL_TCP_Client
 class ESP_SSLClient2 : public BSSL_TCP_Client
 {
 public:
-    ESP_SSLClient2(Client &client, bool enableSSL = true) : _base_client(client)
+    explicit ESP_SSLClient2(Client &client, bool enableSSL = true) : _base_client(client)
     {
         setClient(&_base_client, enableSSL);
     };
@@ -68,7 +68,7 @@ class ESP_SSLClient
 class ESP_SSLClient2
 {
 public:
-    ESP_SSLClient2(Client &client, bool enableSSL = true) : _base_client(client){};
+    explicit ESP_SSLClient2(Client &client, bool enableSSL = true) : _base_client(client){};
     ~ESP_SSLClient2(){};
 
 private:

diff --git a/src/client/SSLClient/ESP_SSLClient_FS.h b/src/client/SSLClient/ESP_SSLClient_FS.h
@@ -34,7 +34,7 @@
 #define ESP_SSLCLIENT_USE_PSRAM
 
 #if defined __has_include
-#if __has_include("Custom_ESP_SSLClient_FS.h")
+#if __has_include(<Custom_ESP_SSLClient_FS.h>)
 #include "Custom_ESP_SSLClient_FS.h"
 #endif
 #endif

diff --git a/src/client/SSLClient/bssl/aes_big_cbcdec.c b/src/client/SSLClient/bssl/aes_big_cbcdec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_CBCDEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_CBCDEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_big_cbcenc.c b/src/client/SSLClient/bssl/aes_big_cbcenc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_CBCENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_CBCENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_big_ctr.c b/src/client/SSLClient/bssl/aes_big_ctr.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_CTR_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_CTR_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_big_ctrcbc.c b/src/client/SSLClient/bssl/aes_big_ctrcbc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_CTRCBC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_CTRCBC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_big_dec.c b/src/client/SSLClient/bssl/aes_big_dec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_DEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_DEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_big_enc.c b/src/client/SSLClient/bssl/aes_big_enc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_BIG_ENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_BIG_ENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_common.c b/src/client/SSLClient/bssl/aes_common.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_COMMON_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_COMMON_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct.c b/src/client/SSLClient/bssl/aes_ct.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64.c b/src/client/SSLClient/bssl/aes_ct64.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_cbcdec.c b/src/client/SSLClient/bssl/aes_ct64_cbcdec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_CBCDEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_CBCDEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_cbcenc.c b/src/client/SSLClient/bssl/aes_ct64_cbcenc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_CBCENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_CBCENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_ctr.c b/src/client/SSLClient/bssl/aes_ct64_ctr.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_CTR_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_CTR_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_ctrcbc.c b/src/client/SSLClient/bssl/aes_ct64_ctrcbc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_CTRCBC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_CTRCBC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_dec.c b/src/client/SSLClient/bssl/aes_ct64_dec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_DEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_DEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct64_enc.c b/src/client/SSLClient/bssl/aes_ct64_enc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT64_ENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT64_ENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_cbcdec.c b/src/client/SSLClient/bssl/aes_ct_cbcdec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_CBCDEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_CBCDEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_cbcenc.c b/src/client/SSLClient/bssl/aes_ct_cbcenc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_CBCENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_CBCENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_ctr.c b/src/client/SSLClient/bssl/aes_ct_ctr.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_CTR_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_CTR_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_ctrcbc.c b/src/client/SSLClient/bssl/aes_ct_ctrcbc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_CTRCBC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_CTRCBC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_dec.c b/src/client/SSLClient/bssl/aes_ct_dec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_DEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_DEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_ct_enc.c b/src/client/SSLClient/bssl/aes_ct_enc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_CT_ENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_CT_ENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_pwr8.c b/src/client/SSLClient/bssl/aes_pwr8.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_PWR8_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_PWR8_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS   1
 #include "inner.h"

diff --git a/src/client/SSLClient/bssl/aes_pwr8_cbcdec.c b/src/client/SSLClient/bssl/aes_pwr8_cbcdec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_PWR8_CBCDEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_PWR8_CBCDEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS   1
 #include "inner.h"

diff --git a/src/client/SSLClient/bssl/aes_pwr8_cbcenc.c b/src/client/SSLClient/bssl/aes_pwr8_cbcenc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_PWR8_CBCENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_PWR8_CBCENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS   1
 #include "inner.h"

diff --git a/src/client/SSLClient/bssl/aes_pwr8_ctr.c b/src/client/SSLClient/bssl/aes_pwr8_ctr.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_PWR8_CTR_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_PWR8_CTR_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS   1
 #include "inner.h"

diff --git a/src/client/SSLClient/bssl/aes_pwr8_ctrcbc.c b/src/client/SSLClient/bssl/aes_pwr8_ctrcbc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_PWR8_CTRCBC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_PWR8_CTRCBC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS   1
 #include "inner.h"

diff --git a/src/client/SSLClient/bssl/aes_small_cbcdec.c b/src/client/SSLClient/bssl/aes_small_cbcdec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_SMALL_CBCDEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_SMALL_CBCDEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_small_cbcenc.c b/src/client/SSLClient/bssl/aes_small_cbcenc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_SMALL_CBCENC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_SMALL_CBCENC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_small_ctr.c b/src/client/SSLClient/bssl/aes_small_ctr.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_SMALL_CTR_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_SMALL_CTR_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_small_ctrcbc.c b/src/client/SSLClient/bssl/aes_small_ctrcbc.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_SMALL_CTRCBC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_SMALL_CTRCBC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"
 

diff --git a/src/client/SSLClient/bssl/aes_small_dec.c b/src/client/SSLClient/bssl/aes_small_dec.c
@@ -23,8 +23,7 @@
  */
 
 #include "../ESP_SSLClient_FS.h"
-#if !defined(EAS_SMALL_DEC_C) && defined(USE_LIB_SSL_ENGINE)
-#define EAS_SMALL_DEC_C
+#if defined(USE_LIB_SSL_ENGINE)
 
 #include "inner.h"