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

tryfix #2416 - lock some guards.

Browse Source
This commit is contained in:
Thomas Göttgens 2023-04-07 15:05:19 +02:00
parent 43cff7adc9
commit 320bf57687
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/CryptoEngine.cpp
View File

@ -1,6 +1,8 @@
#include "CryptoEngine.h" #include "CryptoEngine.h"
#include "configuration.h" #include "configuration.h"
concurrency::Lock *cryptLock;
void CryptoEngine::setKey(const CryptoKey &k) void CryptoEngine::setKey(const CryptoKey &k)
{ {
LOG_DEBUG("Using AES%d key!\n", k.length * 8); LOG_DEBUG("Using AES%d key!\n", k.length * 8);

3
src/mesh/CryptoEngine.h
View File

@ -1,7 +1,10 @@
#pragma once #pragma once
#include "concurrency/LockGuard.h"
#include <Arduino.h> #include <Arduino.h>
extern concurrency::Lock *cryptLock;
struct CryptoKey { struct CryptoKey {
uint8_t bytes[32]; uint8_t bytes[32];

8
src/mesh/Router.cpp
View File

@ -55,6 +55,10 @@ Router::Router() : concurrency::OSThread("Router"), fromRadioQueue(MAX_RX_FROMRA
LOG_DEBUG("Size of MeshPacket %d\n", sizeof(MeshPacket)); */ LOG_DEBUG("Size of MeshPacket %d\n", sizeof(MeshPacket)); */
fromRadioQueue.setReader(this); fromRadioQueue.setReader(this);
// init Lockguard for crypt operations
assert(!cryptLock);
cryptLock = new concurrency::Lock();
} }
/** /**
@ -305,6 +309,8 @@ void Router::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Rout
bool perhapsDecode(meshtastic_MeshPacket *p) bool perhapsDecode(meshtastic_MeshPacket *p)
{ {
concurrency::LockGuard g(cryptLock);
if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER && if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER &&
config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_ALL_SKIP_DECODING) config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_ALL_SKIP_DECODING)
return false; return false;
@ -371,6 +377,8 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
*/ */
meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p) meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
{ {
concurrency::LockGuard g(cryptLock);
// If the packet is not yet encrypted, do so now // If the packet is not yet encrypted, do so now
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) { if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded); size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded);