improve uhwid and jwt cbor encoding

Author: fabik111

examples/auto-retry/provisioning.cpp

@@ -75,7 +75,7 @@ bool Provisioning::poll() {
       //Send UHWID
       ProvisioningOutputMessage idMsg;
       idMsg.type = MessageOutputType::UHWID;
-      idMsg.m.uhwid = UHWID;
+      idMsg.m.uhwid = (byte *) UHWID;
       _agentManager->sendMsg(idMsg);
       //Send JWT
       ProvisioningOutputMessage jwtMsg;

examples/provisioning/ClaimingHandler.cpp

@@ -78,12 +78,11 @@ void ClaimingHandlerClass::getIdReqHandler() {
       sendStatus(StatusMessage::ERROR);
       return;
     }
-    byte _uhwidBytes[33];
+    byte _uhwidBytes[32];
     hexStringToBytes(*_uhwid, _uhwidBytes, _uhwid->length());
-    _uhwidBytes[32] = '\0';
     //Send UHWID
     ProvisioningOutputMessage idMsg = {MessageOutputType::UHWID};
-    idMsg.m.uhwid = (char *)_uhwidBytes;
+    idMsg.m.uhwid = _uhwidBytes;
     _agentManager->sendMsg(idMsg);
     //Send JWT
     ProvisioningOutputMessage jwtMsg = {MessageOutputType::JWT};

src/ConfiguratorAgents/MessagesDefinitions.h

@@ -12,7 +12,7 @@
 #include <settings/settings.h>
 
 #define MAX_UHWID_SIZE 32
-#define MAX_JWT_SIZE  268
+#define MAX_JWT_SIZE  269
 
 enum class StatusMessage {
   NONE                       = 0,
@@ -60,7 +60,7 @@ struct ProvisioningOutputMessage {
   union {
     StatusMessage status;
     const NetworkOptions *netOptions;
-    const char *uhwid;
+    const byte *uhwid; // Must be a pointer to a byte array of MAX_UHWID_SIZE
     const char *jwt;
     const uint8_t *BLEMacAddress;
   } m;

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp

@@ -76,7 +76,7 @@ bool BoardConfigurationProtocol::sendNewMsg(ProvisioningOutputMessage &msg) {
       res = sendNetworkOptions(msg.m.netOptions);
       break;
     case MessageOutputType::UHWID:
-      res = sendUhwid(msg.m.uhwid, strlen(msg.m.uhwid));
+      res = sendUhwid(msg.m.uhwid);
       break;
     case MessageOutputType::JWT:
       res = sendJwt(msg.m.jwt, strlen(msg.m.jwt));
@@ -256,12 +256,8 @@ bool BoardConfigurationProtocol::sendNetworkOptions(const NetworkOptions *netOpt
   return res;
 }
 
-bool BoardConfigurationProtocol::sendUhwid(const char *uhwid, size_t len) {
+bool BoardConfigurationProtocol::sendUhwid(const byte *uhwid) {
   bool res = false;
-  if (len > MAX_UHWID_SIZE) {
-    DEBUG_ERROR("BoardConfigurationProtocol::%s UHWID too long", __FUNCTION__);
-    return res;
-  }
 
   size_t cborDataLen = CBOR_DATA_UHWID_LEN;
   uint8_t data[cborDataLen];

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h

@@ -40,7 +40,7 @@ class BoardConfigurationProtocol {
   bool sendStatus(StatusMessage msg);
   size_t calculateTotalOptionsLength(const NetworkOptions *netOptions);
   bool sendNetworkOptions(const NetworkOptions *netOptions);
-  bool sendUhwid(const char *uhwid, size_t len);
+  bool sendUhwid(const byte *uhwid);
   bool sendJwt(const char *jwt, size_t len);
   bool sendBleMacAddress(const uint8_t *mac, size_t len);
   TransmissionResult transmitStream();

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp

@@ -11,10 +11,10 @@
 #include "cbor/MessageDecoder.h"
 #include <settings/settings_default.h>
 
-bool CBORAdapter::uhwidToCBOR(const char *uhwid, uint8_t *data, size_t *len) {
+bool CBORAdapter::uhwidToCBOR(const byte *uhwid, uint8_t *data, size_t *len) {
   CBORMessageEncoder encoder;
 
-  if (*len < CBOR_DATA_UHWID_LEN || strlen(uhwid) > MAX_UHWID_SIZE) {
+  if (*len < CBOR_DATA_UHWID_LEN) {
     return false;
   }
 
@@ -35,6 +35,7 @@ bool CBORAdapter::jwtToCBOR(const char *jwt, uint8_t *data, size_t *len) {
   CBORMessageEncoder encoder;
 
   if (*len < CBOR_DATA_JWT_LEN || strlen(jwt) > MAX_JWT_SIZE) {
+    Serial.println("CBORAdapter jwtToCBOR: Invalid jwt size");
     return false;
   }
 

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h

@@ -21,7 +21,7 @@
 
 class CBORAdapter {
 public:
-  static bool uhwidToCBOR(const char *uhwid, uint8_t *data, size_t *len);
+  static bool uhwidToCBOR(const byte *uhwid, uint8_t *data, size_t *len);
   static bool jwtToCBOR(const char *jwt, uint8_t *data, size_t *len);
   static bool BLEMacAddressToCBOR(const uint8_t *mac, uint8_t *data, size_t *len);
   static bool statusToCBOR(StatusMessage msg, uint8_t *data, size_t *len);