CryptoUtil: include in the build and add support for devices using SE050 crypto

Author: pennam

src/tls/utility/CryptoUtil.cpp

@@ -21,7 +21,7 @@
 
 #include <AIoTC_Config.h>
 
-#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08)
+#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08) || defined(BOARD_HAS_SE050)
 
 #include "CryptoUtil.h"
 #include "SHA256.h"
@@ -36,7 +36,11 @@
  * CTOR/DTOR
  **************************************************************************************/
 CryptoUtil::CryptoUtil()
+#if defined(BOARD_HAS_SE050)
+: _crypto {SE05X}
+#else
 : _crypto {ECCX08}
+#endif
 {
 
 }
@@ -133,18 +137,35 @@ int CryptoUtil::writeDeviceId(String & device_id, const CryptoSlot device_id_slo
 
 int CryptoUtil::writeCert(ArduinoIoTCloudCertClass & cert, const CryptoSlot certSlot)
 {
+#if defined(BOARD_HAS_SE050)
+  if (!_crypto.writeSlot(static_cast<int>(certSlot), cert.bytes(), cert.length())) {
+    return 0;
+  }
+#else
   if (!_crypto.writeSlot(static_cast<int>(certSlot), cert.compressedCertSignatureAndDatesBytes(), cert.compressedCertSignatureAndDatesLength())) {
     return 0;
   }
 
   if (!_crypto.writeSlot(static_cast<int>(certSlot) + 1, cert.compressedCertSerialAndAuthorityKeyIdBytes(), cert.compressedCertSerialAndAuthorityKeyIdLenght())) {
     return 0;
   }
+#endif
   return 1;
 }
 
 int CryptoUtil::readCert(ArduinoIoTCloudCertClass & cert, const CryptoSlot certSlot)
 {
+#if defined(BOARD_HAS_SE050)
+  byte derBuffer[CRYPTO_CERT_BUFFER_LENGTH];
+  size_t derLen;
+  if (!_crypto.readBinaryObject(static_cast<int>(certSlot), derBuffer, sizeof(derBuffer), &derLen)) {
+    return 0;
+  }
+
+  if (!cert.importCert(derBuffer, derLen)) {
+    return 0;
+  }
+#else
   String deviceId;
   byte publicKey[CERT_PUBLIC_KEY_LENGTH];
 
@@ -183,7 +204,8 @@ int CryptoUtil::readCert(ArduinoIoTCloudCertClass & cert, const CryptoSlot certS
   if (!cert.signCert()) {
     return 0;
   }
+#endif
   return 1;
 }
 
-#endif /* (BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08) */
+#endif /* (BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08) || defined(BOARD_HAS_SE050) */

src/tls/utility/CryptoUtil.h

@@ -24,20 +24,34 @@
 
 #include <AIoTC_Config.h>
 
-#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08)
+#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08) || defined(BOARD_HAS_SE050)
 #include <Arduino.h>
 #include "Cert.h"
+
+#if defined(BOARD_HAS_SE050)
+#include <SE05X.h>
+#else
 #include <ArduinoECCX08.h>
+#endif
+
+/******************************************************************************
+ * DEFINE
+ ******************************************************************************/
+#if defined(BOARD_HAS_SE050)
+#define CRYPTO_SLOT_OFFSET                100
+#else
+#define CRYPTO_SLOT_OFFSET                0
+#endif
 
 /******************************************************************************
    TYPEDEF
  ******************************************************************************/
 enum class CryptoSlot : int
 {
-  Key                                   = 0,
-  CompressedCertificate                 = 10,
-  SerialNumberAndAuthorityKeyIdentifier = 11,
-  DeviceId                              = 12
+  Key                                   = (0  + CRYPTO_SLOT_OFFSET),
+  CompressedCertificate                 = (10 + CRYPTO_SLOT_OFFSET),
+  SerialNumberAndAuthorityKeyIdentifier = (11 + CRYPTO_SLOT_OFFSET),
+  DeviceId                              = (12 + CRYPTO_SLOT_OFFSET)
 };
 
 /******************************************************************************
@@ -64,10 +78,14 @@ class CryptoUtil
   int readCert(ArduinoIoTCloudCertClass & cert, const CryptoSlot certSlot);
 
 private:
+#if defined(BOARD_HAS_SE050)
+  SE05XClass & _crypto;
+#else
   ECCX08Class & _crypto;
+#endif
 
 };
 
-#endif /* BOARD_HAS_ECCX08 || BOARD_HAS_OFFLOADED_ECCX08 */
+#endif /* BOARD_HAS_ECCX08 || BOARD_HAS_OFFLOADED_ECCX08 || BOARD_HAS_SE050 */
 
 #endif /* ARDUINO_IOT_CLOUD_UTILITY_CRYPTO_CRYPTO_UTIL_H_ */