Fix compilation error in v2.0.6.

mobizt · Aug 6, 2023 · e8b7b3e · e8b7b3e
1 parent 2aee90d
commit e8b7b3e
Show file tree

Hide file tree

Showing 311 changed files with 326 additions and 530 deletions.
diff --git a/examples/certificate/certificate.ino b/examples/certificate/certificate.ino
@@ -17,10 +17,10 @@
 #include <WiFi.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
-#elif  __has_include(<WiFiNINA.h>)
-#include <WiFiNINA.h
+#elif __has_include(<WiFiNINA.h>)
+#include <WiFiNINA.h>
 #elif __has_include(<WiFi101.h>)
-#include <WiFi101.h
+#include <WiFi101.h>
 #endif
 
 #include <ESP_SSLClient.h>
@@ -101,7 +101,7 @@ void setup()
  // If verification time was not set via this function, the device system time will be used
  // ssl_client.setX509Time(time(nullptr));
 
-#elif defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_NANO_RP2040_CONNECT)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 
  configTime(10000, 0, "pool.ntp.org", "time.nist.gov");
  while (time(nullptr) < ESP_SSLCLIENT_VALID_TIMESTAMP)
@@ -113,12 +113,17 @@ void setup()
  // ssl_client.setX509Time(time(nullptr));
 
 #elif __has_include(<WiFiNINA.h>) || __has_include(<WiFi101.h>)
- time_t ts = WiFi.getTime();
+ time_t ts = 0;
+ do
+ {
+ ts = WiFi.getTime();
+ delay(100);
+ } while (ts < ESP_SSLCLIENT_VALID_TIMESTAMP);
 
  // The verification time setting is required because the device system time i.e. time(nullptr) is not available in this case.
  ssl_client.setX509Time(ts);
 #endif
- 
+
  // Set the server certificate, intermediate cerificate or root certificate
  ssl_client.setCACert(rootCA);
 

diff --git a/examples/http_upgrade/http_upgrade.ino b/examples/http_upgrade/http_upgrade.ino
@@ -17,9 +17,9 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #elif __has_include(<WiFiNINA.h>)
-#include <WiFiNINA.h
+#include <WiFiNINA.h>
 #elif __has_include(<WiFi101.h>)
-#include <WiFi101.h
+#include <WiFi101.h>
 #endif
 
 #include <ESP_SSLClient.h>

diff --git a/examples/https/https.ino b/examples/https/https.ino
@@ -18,9 +18,9 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #elif __has_include(<WiFiNINA.h>)
-#include <WiFiNINA.h
+#include <WiFiNINA.h>
 #elif __has_include(<WiFi101.h>)
-#include <WiFi101.h
+#include <WiFi101.h>
 #endif
 
 #include <ESP_SSLClient.h>

diff --git a/examples/mqtt/mqtt.ino b/examples/mqtt/mqtt.ino
@@ -17,9 +17,9 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #elif __has_include(<WiFiNINA.h>)
-#include <WiFiNINA.h
+#include <WiFiNINA.h>
 #elif __has_include(<WiFi101.h>)
-#include <WiFi101.h
+#include <WiFi101.h>
 #endif
 
 #include <ESP_SSLClient.h>

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
  "name": "ESP_SSLClient",
- "version": "2.0.6",
+ "version": "2.0.7",
  "keywords": "communication, REST, esp32, esp8266, arduino",
  "description": "This library provided the Secure Layer Networking (SSL/TLS) TCP Client for ESP8266, ESP32 and Raspberry Pi RP2040, Teensy, SAMD, AVR and other Arduino devices that support external networking interfaces e.g., WiFiClient, EthernetClient and GSMClient.",
  "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP_SSLClient
 
-version=2.0.6
+version=2.0.7
 
 author=Mobizt
 

diff --git a/src/ESP_SSLClient.h b/src/ESP_SSLClient.h
@@ -1,6 +1,6 @@
 /**
  *
- * The ESP SSL Client Class, ESP_SSLClient.h v2.0.6
+ * The ESP SSL Client Class, ESP_SSLClient.h v2.0.7
  *
  * Created August 6, 2023
  *

diff --git a/src/bssl/aes_big_cbcdec.c b/src/bssl/aes_big_cbcdec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_big_cbcenc.c b/src/bssl/aes_big_cbcenc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_big_ctr.c b/src/bssl/aes_big_ctr.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_big_ctrcbc.c b/src/bssl/aes_big_ctrcbc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_big_dec.c b/src/bssl/aes_big_dec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /*
  * Inverse S-box (used in key schedule for decryption).

diff --git a/src/bssl/aes_big_enc.c b/src/bssl/aes_big_enc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 #define S br_aes_S
 

diff --git a/src/bssl/aes_common.c b/src/bssl/aes_common.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 static const uint32_t Rcon[] = {
  0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000,

diff --git a/src/bssl/aes_ct.c b/src/bssl/aes_ct.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see inner.h */
 void

diff --git a/src/bssl/aes_ct64.c b/src/bssl/aes_ct64.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see inner.h */
 void

diff --git a/src/bssl/aes_ct64_cbcdec.c b/src/bssl/aes_ct64_cbcdec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct64_cbcenc.c b/src/bssl/aes_ct64_cbcenc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct64_ctr.c b/src/bssl/aes_ct64_ctr.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct64_ctrcbc.c b/src/bssl/aes_ct64_ctrcbc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct64_dec.c b/src/bssl/aes_ct64_dec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see inner.h */
 void

diff --git a/src/bssl/aes_ct64_enc.c b/src/bssl/aes_ct64_enc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 static inline void
 add_round_key(uint64_t *q, const uint64_t *sk)

diff --git a/src/bssl/aes_ct_cbcdec.c b/src/bssl/aes_ct_cbcdec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct_cbcenc.c b/src/bssl/aes_ct_cbcenc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct_ctr.c b/src/bssl/aes_ct_ctr.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct_ctrcbc.c b/src/bssl/aes_ct_ctrcbc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_ct_dec.c b/src/bssl/aes_ct_dec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see inner.h */
 void

diff --git a/src/bssl/aes_ct_enc.c b/src/bssl/aes_ct_enc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 static inline void
 add_round_key(uint32_t *q, const uint32_t *sk)

diff --git a/src/bssl/aes_pwr8.c b/src/bssl/aes_pwr8.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 /*
  * This code contains the AES key schedule implementation using the

diff --git a/src/bssl/aes_pwr8_cbcdec.c b/src/bssl/aes_pwr8_cbcdec.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 #if BR_POWER8
 

diff --git a/src/bssl/aes_pwr8_cbcenc.c b/src/bssl/aes_pwr8_cbcenc.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 #if BR_POWER8
 

diff --git a/src/bssl/aes_pwr8_ctr.c b/src/bssl/aes_pwr8_ctr.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 #if BR_POWER8
 

diff --git a/src/bssl/aes_pwr8_ctrcbc.c b/src/bssl/aes_pwr8_ctrcbc.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_POWER_ASM_MACROS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 #if BR_POWER8
 

diff --git a/src/bssl/aes_small_cbcdec.c b/src/bssl/aes_small_cbcdec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_small_cbcenc.c b/src/bssl/aes_small_cbcenc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_small_ctr.c b/src/bssl/aes_small_ctr.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_small_ctrcbc.c b/src/bssl/aes_small_ctrcbc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /* see bearssl_block.h */
 void

diff --git a/src/bssl/aes_small_dec.c b/src/bssl/aes_small_dec.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 /*
  * Inverse S-box.

diff --git a/src/bssl/aes_small_enc.c b/src/bssl/aes_small_enc.c
@@ -25,7 +25,7 @@
 #include "../ESP_SSLClient_FS.h"
 #if defined(USE_LIB_SSL_ENGINE)
 
-#include "bssl/inner.h"
+#include "inner.h"
 
 #define S br_aes_S
 

diff --git a/src/bssl/aes_x86ni.c b/src/bssl/aes_x86ni.c
@@ -26,7 +26,7 @@
 #if defined(USE_LIB_SSL_ENGINE)
 
 #define BR_ENABLE_INTRINSICS 1
-#include "bssl/inner.h"
+#include "inner.h"
 
 /*
  * This code contains the AES key schedule implementation using the