rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-25 11:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7744 from meshtastic/master

Browse Source 
Backmerge to develop
This commit is contained in:
Ben Meadors
2025-08-25 06:58:05 -05:00
committed by GitHub
parent 1eafdfcbc8 3d825c51dd
commit f2ba7d7851
4 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesh/Router.cpp
View File

@@ -529,8 +529,9 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
#endif
// Don't use PKC with Ham mode
!owner.is_licensed &&
// Don't use PKC if it's not explicitly requested and a non-primary channel is requested
!(p->pki_encrypted != true && p->channel > 0) &&
// Don't use PKC on 'serial' or 'gpio' channels unless explicitly requested
!(p->pki_encrypted != true && (strcasecmp(channels.getName(chIndex), Channels::serialChannel) == 0 ||
strcasecmp(channels.getName(chIndex), Channels::gpioChannel) == 0)) &&
// Check for valid keys and single node destination
config.security.private_key.size == 32 && !isBroadcast(p->to) && node != nullptr &&
// Check for a known public key for the destination