Merge pull request #13 from pennam/bearssl-fix

Do not include ArduinoBearSSL if ArduinoIoTCloud is included
arduino-libraries · May 7, 2024 · 4006615 · 4006615
2 parents 4e445aa + f1d362a
commit 4006615
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/ArduinoCellular.cpp b/src/ArduinoCellular.cpp
@@ -35,8 +35,9 @@ void ArduinoCellular::begin() {
     modem.sendAT("+CNMI=2,1,0,0,0");
     modem.waitResponse();
 
-
+#if defined(ARDUINO_CELLULAR_BEARSSL)
     ArduinoBearSSL.onGetTime(ArduinoCellular::getTime);
+#endif
 
 }
 
@@ -155,13 +156,15 @@ HttpClient ArduinoCellular::getHTTPClient(const char * server, const int port){
     return HttpClient(* new TinyGsmClient(modem), server, port);
 }
 
+#if defined(ARDUINO_CELLULAR_BEARSSL)
 HttpClient ArduinoCellular::getHTTPSClient(const char * server, const int port){
     return HttpClient(* new BearSSLClient(* new TinyGsmClient(modem)), server, port);
 }
 
 BearSSLClient ArduinoCellular::getSecureNetworkClient(){
     return BearSSLClient(* new TinyGsmClient(modem));
 }
+#endif
 
 bool ArduinoCellular::isConnectedToOperator(){
     return modem.isNetworkConnected();

diff --git a/src/ArduinoCellular.h b/src/ArduinoCellular.h
@@ -16,8 +16,18 @@
 
 #include <Arduino.h>
 #include <vector>
-#include "ArduinoBearSSLConfig.h"
-#include <ArduinoBearSSL.h>
+
+#if defined __has_include
+  #if !__has_include (<ArduinoIoTCloud.h>)
+    #define ARDUINO_CELLULAR_BEARSSL
+  #endif
+#endif
+
+#if defined(ARDUINO_CELLULAR_BEARSSL)
+  #include "ArduinoBearSSLConfig.h"
+  #include <ArduinoBearSSL.h>
+#endif
+
 #include <ModemInterface.h>
 #include <TimeUtils.h>
 
@@ -206,7 +216,9 @@ class ArduinoCellular {
          * @brief Gets the Transport Layer Security (TLS) client. (OSI Layer 4)
          * @return The GSM client.
          */
+#if defined(ARDUINO_CELLULAR_BEARSSL)
         BearSSLClient getSecureNetworkClient();
+#endif
 
         /**
          * @brief Gets the HTTP client for the specified server and port.