SecureElementConfig: rename configuration defines to avoid clashes with ConnectionHandler

Author: pennam

src/ECP256Certificate.h

@@ -68,7 +68,7 @@ class ECP256Certificate {
   inline byte* bytes() { return _certBuffer; }
   inline int length() { return _certBufferLen; }
 
-#if defined(BOARD_HAS_ECCX08)
+#if defined(SECURE_ELEMENT_IS_ECCX08)
   /* Get Data to create ECCX08 compressed cert */
   inline byte* compressedCertBytes() { return _compressedCert.data; }
   inline int compressedCertLenght() {return ECP256_CERT_COMPRESSED_CERT_LENGTH; }

src/SecureElement.cpp

@@ -19,10 +19,14 @@
  * CTOR/DTOR
  **************************************************************************************/
 SecureElement::SecureElement()
-#if defined(BOARD_HAS_SE050)
+#if defined(SECURE_ELEMENT_IS_SE050)
 : _secureElement {SE05X}
-#else
+#elif defined(SECURE_ELEMENT_IS_ECCX08)
 : _secureElement {ECCX08}
+#elif defined(SECURE_ELEMENT_IS_SOFTSE)
+: _secureElement {SATSE}
+#else
+
 #endif
 {
 
@@ -114,7 +118,7 @@ int SecureElement::SHA256(const uint8_t *buffer, size_t size, uint8_t *digest)
   _secureElement.beginSHA256();
   uint8_t * cursor = (uint8_t*)buffer;
   uint32_t bytes_read = 0;
-#if defined(BOARD_HAS_SE050)
+#if defined(SECURE_ELEMENT_IS_SE050)
   size_t outLen = 32;
   for(; bytes_read + 64 < size; bytes_read += 64, cursor += 64) {
     _secureElement.updateSHA256(cursor, 64);

src/SecureElement.h

@@ -18,11 +18,13 @@
 #include <Arduino.h>
 #include <SecureElementConfig.h>
 
-#if defined(BOARD_HAS_ECCX08)
+#if defined(SECURE_ELEMENT_IS_ECCX08)
   #include <ECCX08.h>
-  #include <ECCX08DefaultTLSConfig.h>
-#elif defined(BOARD_HAS_SE050)
+  #include <utility/ECCX08DefaultTLSConfig.h>
+#elif defined(SECURE_ELEMENT_IS_SE050)
   #include <SE05X.h>
+#elif defined(SECURE_ELEMENT_IS_SOFTSE)
+  #include <SoftwareATSE.h>
 #else
   #error "Board not supported"
 #endif
@@ -66,20 +68,21 @@ class SecureElement
 
   inline int locked() { return _secureElement.locked(); }
   inline int lock() { return _secureElement.lock(); }
-#if defined(BOARD_HAS_ECCX08)
+#if defined(SECURE_ELEMENT_IS_ECCX08)
   inline int writeConfiguration(const byte config[] = ECCX08_DEFAULT_TLS_CONFIG) { return _secureElement.writeConfiguration(config); }
 #else
   inline int writeConfiguration(const byte config[] = nullptr) { return _secureElement.writeConfiguration(config); }
 #endif
 
-  int writeCert(ECP256Certificate & cert, const int certSlot);
-  int readCert(ECP256Certificate & cert, const int certSlot, const int keySlot = 0);
-
 private:
-#if defined(BOARD_HAS_SE050)
+#if defined(SECURE_ELEMENT_IS_SE050)
   SE05XClass & _secureElement;
-#else
+#elif defined(SECURE_ELEMENT_IS_ECCX08)
   ECCX08Class & _secureElement;
+#elif defined(SECURE_ELEMENT_IS_SOFTSE)
+  SoftwareATSEClass & _secureElement;
+#else
+
 #endif
 
 };

src/SecureElementConfig.h

@@ -17,11 +17,15 @@
   defined(ARDUINO_SAMD_MKRNB1500)   || defined(ARDUINO_PORTENTA_H7_M7)  ||   \
   defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_OPTA) || \
   defined(ARDUINO_GIGA)
-  #define BOARD_HAS_ECCX08
+  #define SECURE_ELEMENT_IS_ECCX08
 #endif
 
 #if defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_PORTENTA_C33)
-  #define BOARD_HAS_SE050
+  #define SECURE_ELEMENT_IS_SE050
+#endif
+
+#if defined(ARDUINO_UNOR4_WIFI)
+  #define SECURE_ELEMENT_IS_SOFTSE
 #endif
 
 #endif /* SECURE_ELEMENT_CONFIG_H_ */