Skip to content

Changes for migration from Provisioning 1.0 to Provisioning 2.0 #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+60 −25
Open

Changes for migration from Provisioning 1.0 to Provisioning 2.0 #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81dba61
generate private key if fails in generating the token
fabik111 Apr 23, 2025
e2e79b0
send public key before uhwid
fabik111 Jun 27, 2025
4285899
print sketch version
fabik111 Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 58 additions & 24 deletions examples/utility/Provisioning_2.0/ClaimingHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,30 +92,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, 1, 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() {
Expand Down Expand Up @@ -186,7 +203,24 @@ void ClaimingHandlerClass::getProvSketchVersionRequestCb() {
_receivedEvent = ClaimingReqEvents::GET_PROV_SKETCH_VERSION;
}

bool ClaimingHandlerClass::sendStatus(StatusMessage msg) {
ProvisioningOutputMessage statusMsg = { MessageOutputType::STATUS, { msg } };
return _agentManager.sendMsg(statusMsg);
String ClaimingHandlerClass::generateToken()
{
Comment on lines +206 to +207
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: why { is on a new line?

String token = getAIoTCloudJWT(*_secureElement, *_uhwid, _ts, 1);
if(token == "") {
byte publicKey[64];
DEBUG_INFO("Generating private key");
if(!_secureElement->generatePrivateKey(1, publicKey)){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use a constant to hold the private key slot, it would be much clearer

DEBUG_ERROR("CH::%s Error: private key generation failed", __FUNCTION__);
return "";
}
token = getAIoTCloudJWT(*_secureElement, *_uhwid, _ts, 1);
}

return token;
}

bool ClaimingHandlerClass::sendStatus(StatusMessage msg)
{
ProvisioningOutputMessage statusMsg = {MessageOutputType::STATUS, {msg}};
return _agentManager.sendMsg(statusMsg);
}
1 change: 1 addition & 0 deletions examples/utility/Provisioning_2.0/ClaimingHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ClaimingHandlerClass {
LEDFeedbackClass &_ledFeedback;
static inline uint64_t _ts;
SecureElement *_secureElement;
String generateToken();

bool sendStatus(StatusMessage msg);
/* Commands handlers */
Expand Down
2 changes: 1 addition & 1 deletion examples/utility/Provisioning_2.0/Provisioning_2.0.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down