Skip to content

Signature key resolution and a send-path leak #11283

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

Merged
thebentern merged 2 commits into from
Jul 29, 2026
Merged

Signature key resolution and a send-path leak #11283

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747e8ef
Verify signatures against authoritative keys only
caveman99 Jul 29, 2026
d96e823
Release the packet on the unset-variant send error
caveman99 Jul 29, 2026
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
6 changes: 5 additions & 1 deletion src/mesh/Router.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)

if (!(p->which_payload_variant == meshtastic_MeshPacket_encrypted_tag ||
p->which_payload_variant == meshtastic_MeshPacket_decoded_tag)) {
// Error returns from here own the packet, as the position-precision path below does.
packetPool.release(p);
return meshtastic_Routing_Error_BAD_REQUEST;
}

Expand Down Expand Up @@ -633,7 +635,9 @@ bool checkXeddsaReceivePolicy(meshtastic_MeshPacket *p)
if (p->decoded.xeddsa_signature.size == XEDDSA_SIGNATURE_SIZE) {
meshtastic_NodeInfoLite_public_key_t senderKey = {0, {0}};
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->from);
if (nodeDB->copyPublicKey(p->from, senderKey)) {
// Authoritative keys only: verifying against an opportunistic cache key would let a planted
// key mark its own node a signer, the trust loop #11116 closed on the decrypt path.
if (nodeDB->copyPublicKeyAuthoritative(p->from, senderKey)) {
p->xeddsa_signed =
crypto->xeddsa_verify(senderKey.bytes, p->from, p->id, p->decoded.portnum, p->decoded.payload.bytes,
p->decoded.payload.size, p->decoded.xeddsa_signature.bytes);
Expand Down
Loading