Fixing conditional compilation for ESP targets

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -25,7 +25,6 @@
 #include <ArduinoIoTCloudTCP.h>
 #include "utility/time/TimeService.h"
 #ifdef BOARD_HAS_ECCX08
-  #include <ArduinoECCX08.h>
   #include "utility/crypto/CryptoUtil.h"
   #include "tls/BearSSLTrustAnchors.h"
 #endif

src/tls/BearSSLClient.cpp

@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #include <ArduinoECCX08.h>
 
 #include <assert.h>
@@ -379,3 +382,5 @@ void BearSSLClient::clientAppendCert(void *ctx, const void *data, size_t len)
   memcpy(&c->_ecCert.data[c->_ecCert.data_len], data, len);
   c->_ecCert.data_len += len;
 }
+
+#endif /* #ifdef BOARD_HAS_ECCX08 */

src/tls/BearSSLClient.h

@@ -25,6 +25,9 @@
 #ifndef _BEAR_SSL_CLIENT_H_
 #define _BEAR_SSL_CLIENT_H_
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #ifndef BEAR_SSL_CLIENT_OBUF_SIZE
 #define BEAR_SSL_CLIENT_OBUF_SIZE 512 + 85
 #endif
@@ -102,4 +105,6 @@ class BearSSLClient : public Client {
   br_sslio_context _ioc;
 };
 
+#endif /* #ifdef BOARD_HAS_ECCX08 */
+
 #endif

src/tls/BearSSLTrustAnchors.h

@@ -23,6 +23,9 @@
  * INCLUDE
  ******************************************************************************/
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #include "bearssl/bearssl_ssl.h"
 
 /******************************************************************************
@@ -102,4 +105,6 @@ static const br_x509_trust_anchor ArduinoIoTCloudTrustAnchor[2] = {
 
 #define ArduinoIoTCloudTrustAnchor_NUM (2)
 
+#endif /* #ifdef BOARD_HAS_ECCX08 */
+
 #endif /* _BEAR_SSL_TRUST_ANCHOR_H_ */

src/tls/utility/eccX08_asn1.h

@@ -25,6 +25,9 @@
 #ifndef _ECCX08_ASN1_H_
 #define _ECCX08_ASN1_H_
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #include "../bearssl/bearssl.h"
 
 size_t
@@ -38,4 +41,6 @@ eccX08_vrfy_asn1(const br_ec_impl *impl,
   const br_ec_public_key *pk,
   const void *sig, size_t sig_len);
 
+#endif /* #ifdef BOARD_HAS_ECCX08 */
+
 #endif

src/tls/utility/eccX08_sign_asn1.cpp

@@ -23,6 +23,9 @@
  * SOFTWARE.
  */
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #include "eccX08_asn1.h"
 
 #include <ArduinoECCX08.h>
@@ -51,3 +54,5 @@ eccX08_sign_asn1(const br_ec_impl * /*impl*/,
   memcpy(sig, rsig, sig_len);
   return sig_len;
 }
+
+#endif /* #ifdef BOARD_HAS_ECCX08 */

src/tls/utility/eccX08_vrfy_asn1.cpp

@@ -23,6 +23,9 @@
  * SOFTWARE.
  */
 
+#include <ArduinoIoTCloud_Config.h>
+#ifdef BOARD_HAS_ECCX08
+
 #include "eccX08_asn1.h"
 
 #include <ArduinoECCX08.h>
@@ -60,3 +63,5 @@ eccX08_vrfy_asn1(const br_ec_impl * /*impl*/,
 
   return 1;
 }
+
+#endif /* #ifdef BOARD_HAS_ECCX08 */