Merge pull request #547 from fabik111/migration

Changes for migration from Provisioning 1.0 to Provisioning 2.0

Author: fabik111

examples/utility/Provisioning_2.0/ClaimingHandler.cpp

@@ -13,6 +13,8 @@
 #include "utility/HCI.h"
 #include <Arduino_HEX.h>
 
+#define SLOT_BOARD_PRIVATE_KEY 1
+
 extern const char *SKETCH_VERSION;
 
 ClaimingHandlerClass::ClaimingHandlerClass():
@@ -92,30 +94,47 @@ void ClaimingHandlerClass::poll() {
 }
 
 void ClaimingHandlerClass::getIdReqHandler() {
-  if (_ts != 0) {
-    byte _uhwidBytes[32];
-    hex::decode(_uhwid->c_str(), _uhwidBytes, _uhwid->length());
-    //Send UHWID
-    ProvisioningOutputMessage idMsg = {MessageOutputType::UHWID};
-    idMsg.m.uhwid = _uhwidBytes;
-    _agentManager.sendMsg(idMsg);
-
-    String token = getAIoTCloudJWT(*_secureElement, *_uhwid, _ts, 1);
-    if (token == "") {
-      DEBUG_ERROR("CH::%s Error: token not created", __FUNCTION__);
-      sendStatus(StatusMessage::ERROR);
-      return;
-    }
-
-    //Send JWT
-    ProvisioningOutputMessage jwtMsg = {MessageOutputType::JWT};
-    jwtMsg.m.jwt = token.c_str();
-    _agentManager.sendMsg(jwtMsg);
-    _ts = 0;
-  } else {
+  if (_ts == 0) {
     DEBUG_ERROR("CH::%s Error: timestamp not provided" , __FUNCTION__);
     sendStatus(StatusMessage::PARAMS_NOT_FOUND);
+    return;
   }
+
+  byte _uhwidBytes[32];
+  hex::decode(_uhwid->c_str(), _uhwidBytes, _uhwid->length());
+
+  String token = generateToken();
+  if (token == "") {
+    DEBUG_ERROR("CH::%s Error: token not created", __FUNCTION__);
+    sendStatus(StatusMessage::ERROR);
+    return;
+  }
+
+  SElementJWS sejws;
+  String publicKey =  sejws.publicKey(*_secureElement, SLOT_BOARD_PRIVATE_KEY, false);
+  if (publicKey == "") {
+    DEBUG_ERROR("CH::%s Error: public key not created", __FUNCTION__);
+    sendStatus(StatusMessage::ERROR);
+    return;
+  }
+
+  //Send public key
+  ProvisioningOutputMessage publicKeyMsg = {MessageOutputType::PROV_PUBLIC_KEY};
+  publicKeyMsg.m.provPublicKey = publicKey.c_str();
+  _agentManager.sendMsg(publicKeyMsg);
+
+
+  //Send UHWID
+  ProvisioningOutputMessage idMsg = {MessageOutputType::UHWID};
+  idMsg.m.uhwid = _uhwidBytes;
+  _agentManager.sendMsg(idMsg);
+
+  //Send JWT
+  ProvisioningOutputMessage jwtMsg = {MessageOutputType::JWT};
+  jwtMsg.m.jwt = token.c_str();
+  _agentManager.sendMsg(jwtMsg);
+  _ts = 0;
+
 }
 
 void ClaimingHandlerClass::resetStoredCredReqHandler() {
@@ -186,7 +205,22 @@ void ClaimingHandlerClass::getProvSketchVersionRequestCb() {
   _receivedEvent = ClaimingReqEvents::GET_PROV_SKETCH_VERSION;
 }
 
+String ClaimingHandlerClass::generateToken() {
+  String token = getAIoTCloudJWT(*_secureElement, *_uhwid, _ts, SLOT_BOARD_PRIVATE_KEY);
+  if(token == "") {
+    byte publicKey[64];
+    DEBUG_INFO("Generating private key");
+    if(!_secureElement->generatePrivateKey(SLOT_BOARD_PRIVATE_KEY, publicKey)){
+      DEBUG_ERROR("CH::%s Error: private key generation failed", __FUNCTION__);
+      return "";
+    }
+    token = getAIoTCloudJWT(*_secureElement, *_uhwid, _ts, SLOT_BOARD_PRIVATE_KEY);
+  }
+
+  return token;
+}
+
 bool ClaimingHandlerClass::sendStatus(StatusMessage msg) {
-  ProvisioningOutputMessage statusMsg = { MessageOutputType::STATUS, { msg } };
-  return _agentManager.sendMsg(statusMsg);
+    ProvisioningOutputMessage statusMsg = {MessageOutputType::STATUS, {msg}};
+    return _agentManager.sendMsg(statusMsg);
 }

examples/utility/Provisioning_2.0/ClaimingHandler.h

@@ -36,6 +36,7 @@ class ClaimingHandlerClass {
   LEDFeedbackClass &_ledFeedback;
   static inline uint64_t _ts;
   SecureElement *_secureElement;
+  String generateToken();
 
   bool sendStatus(StatusMessage msg);
   /* Commands handlers */

examples/utility/Provisioning_2.0/Provisioning_2.0.ino

@@ -15,7 +15,7 @@
 #include <utility/SElementArduinoCloudCertificate.h>
 #include "utility/LEDFeedback.h"
 
-const char *SKETCH_VERSION = "0.1.0";
+const char *SKETCH_VERSION = "0.3.0";
 
 enum class DeviceState {
     HARDWARE_CHECK,
@@ -59,7 +59,7 @@ void setup() {
   initProperties();
   AgentsManagerClass::getInstance().begin();
   LEDFeedbackClass::getInstance().begin();
-  DEBUG_INFO("Starting Provisioning");
+  DEBUG_INFO("Starting Provisioning version %s", SKETCH_VERSION);
 }
 
 void sendStatus(StatusMessage msg) {