pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-10 15:12:06 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Re-set the extra-nonce value

Browse Source
This commit is contained in:
Jonathan Bennett 2024-08-18 22:25:08 -05:00
parent 94d5ee9fe6
commit 273beef148
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesh/CryptoEngine.cpp
View File

@ -42,9 +42,10 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
{ {
uint8_t *auth; uint8_t *auth;
uint32_t *extraNonce; uint32_t *extraNonce;
long extraNonceTmp = random();
auth = bytesOut + numBytes; auth = bytesOut + numBytes;
extraNonce = (uint32_t *)(auth + 8); extraNonce = (uint32_t *)(auth + 8);
*extraNonce = random(); *extraNonce = extraNonceTmp;
LOG_INFO("Random nonce value: %d\n", *extraNonce); LOG_INFO("Random nonce value: %d\n", *extraNonce);
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(toNode); meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(toNode);
if (node->num < 1 || node->user.public_key.size == 0) { if (node->num < 1 || node->user.public_key.size == 0) {
@ -59,7 +60,9 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
// Calculate the shared secret with the destination node and encrypt // Calculate the shared secret with the destination node and encrypt
printBytes("Attempting encrypt using nonce: ", nonce, 13); printBytes("Attempting encrypt using nonce: ", nonce, 13);
printBytes("Attempting encrypt using shared_key: ", shared_key, 32); printBytes("Attempting encrypt using shared_key: ", shared_key, 32);
aes_ccm_ae(shared_key, 32, nonce, 8, bytes, numBytes, nullptr, 0, bytesOut, auth); aes_ccm_ae(shared_key, 32, nonce, 8, bytes, numBytes, nullptr, 0, bytesOut,
auth); // this can write up to 15 bytes longer than numbytes past bytesOut
*extraNonce = extraNonceTmp;
return true; return true;
} }