DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* workaround for Identity::verify() bug.

Browse Source
This commit is contained in:
Scott Powell
2025-03-19 14:31:48 +11:00
parent 69a6d76b87
commit 4943b388c0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mesh.cpp
View File

@@ -1,5 +1,6 @@
#include "Mesh.h" #include "Mesh.h"
//#include <Arduino.h> //#include <Arduino.h>
#include <Ed25519.h>
namespace mesh { namespace mesh {
@@ -228,16 +229,14 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
// check that signature is valid // check that signature is valid
bool is_ok; bool is_ok;
{ {
static uint8_t message[PUB_KEY_SIZE + 4 + MAX_ADVERT_DATA_SIZE]; uint8_t message[PUB_KEY_SIZE + 4 + MAX_ADVERT_DATA_SIZE];
int msg_len = 0; int msg_len = 0;
memcpy(&message[msg_len], id.pub_key, PUB_KEY_SIZE); msg_len += PUB_KEY_SIZE; memcpy(&message[msg_len], id.pub_key, PUB_KEY_SIZE); msg_len += PUB_KEY_SIZE;
memcpy(&message[msg_len], &timestamp, 4); msg_len += 4; memcpy(&message[msg_len], &timestamp, 4); msg_len += 4;
memcpy(&message[msg_len], app_data, app_data_len); msg_len += app_data_len; memcpy(&message[msg_len], app_data, app_data_len); msg_len += app_data_len;
static uint8_t sig_copy[SIGNATURE_SIZE]; //is_ok = id.verify(signature, message, msg_len);
memcpy(sig_copy, signature, SIGNATURE_SIZE); is_ok = Ed25519::verify(signature, id.pub_key, message, msg_len);
is_ok = id.verify(sig_copy, message, msg_len);
} }
if (is_ok) { if (is_ok) {
MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): valid advertisement received!", getLogDateTime()); MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): valid advertisement received!", getLogDateTime());