Turning global variable 'ECCX08Cert' into local member variable '_eccx08_cert'

Author: aentinger

examples/utility/Provisioning/Provisioning.ino

@@ -1,5 +1,4 @@
 #include <ArduinoIoTCloud.h>
-#include <utility/crypto/ECCX08Cert.h>
 #include <utility/crypto/ECCX08TLSConfig.h>
 
 #include <ArduinoBearSSL.h>
@@ -11,6 +10,8 @@ const int compressedCertSlot                        = 10;
 const int serialNumberAndAuthorityKeyIdentifierSlot = 11;
 const int deviceIdSlot                              = 12;
 
+ECCX08CertClass ECCX08Cert;
+
 void setup() {
   Serial.begin(9600);
   while (!Serial);

src/ArduinoIoTCloudTCP.cpp

@@ -22,7 +22,6 @@
 #ifdef BOARD_HAS_ECCX08
   #include <ArduinoECCX08.h>
   #include "utility/crypto/BearSSLTrustAnchor.h"
-  #include "utility/crypto/CryptoUtil.h"
 #endif
 
 TimeService time_service;
@@ -76,10 +75,10 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
   #ifdef BOARD_HAS_ECCX08
   if (!ECCX08.begin())                                                                                                                                                    { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }
   if (!CryptoUtil::readDeviceId(ECCX08, _device_id, ECCX08Slot::DeviceId))                                                                                                { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }
-  if (!CryptoUtil::reconstructCertificate(ECCX08Cert, _device_id, ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
+  if (!CryptoUtil::reconstructCertificate(_eccx08_cert, _device_id, ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
   ArduinoBearSSL.onGetTime(getTime);
   _sslClient = new BearSSLClient(_connection->getClient(), ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM);
-  _sslClient->setEccSlot(static_cast<int>(ECCX08Slot::Key), ECCX08Cert.bytes(), ECCX08Cert.length());
+  _sslClient->setEccSlot(static_cast<int>(ECCX08Slot::Key), _eccx08_cert.bytes(), _eccx08_cert.length());
   #elif defined(BOARD_ESP)
   _sslClient = new WiFiClientSecure();
   _sslClient->setInsecure();

src/ArduinoIoTCloudTCP.h

@@ -22,8 +22,9 @@
 #include <ArduinoIoTCloud.h>
 #include <Arduino_ConnectionHandler.h>
 
-#ifdef BOARD_HAS_ECCX08 /
+#ifdef BOARD_HAS_ECCX08
   #include <ArduinoBearSSL.h>
+  #include "utility/crypto/CryptoUtil.h"
 #elif defined(BOARD_ESP)
   #include <WiFiClientSecure.h>
 #endif
@@ -99,6 +100,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     bool _mqtt_data_request_retransmit;
 
     #ifdef BOARD_HAS_ECCX08
+    ECCX08CertClass _eccx08_cert;
     BearSSLClient* _sslClient;
     #elif defined(BOARD_ESP)
     WiFiClientSecure* _sslClient;

src/utility/crypto/ECCX08Cert.cpp

@@ -923,6 +923,4 @@ int ECCX08CertClass::appendEcdsaWithSHA256(byte out[]) {
   return 12;
 }
 
-ECCX08CertClass ECCX08Cert;
-
 #endif /* BOARD_HAS_ECCX08 */

src/utility/crypto/ECCX08Cert.h

@@ -134,8 +134,6 @@ class ECCX08CertClass {
     int _length;
 };
 
-extern ECCX08CertClass ECCX08Cert;
-
 #endif /* BOARD_HAS_ECCX08 */
 
 #endif /* _ECCX08_CERT_H_ */