pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-11 16:37:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix inadvertent overwrite

Browse Source
This commit is contained in:
Jason B. Cox 2025-05-13 11:20:05 -07:00
parent 66560fbcfa
commit cf1e1e5373
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh/CryptoEngine.cpp
View File

@ -264,7 +264,7 @@ bool CryptoEngine::setCryptoSharedSecret(meshtastic_UserLite_public_key_t pubkey
memcpy(&lookupKey, pubkey.bytes, sizeof(lookupKey)); memcpy(&lookupKey, pubkey.bytes, sizeof(lookupKey));
uint16_t oldestDelta = 0; uint16_t oldestDelta = 0;
CachedSharedSecret &oldestEntry = sharedSecretCache[0]; size_t oldestIndex = 0;
for (size_t i = 0; i < MAX_CACHED_SHARED_SECRETS; i++) { for (size_t i = 0; i < MAX_CACHED_SHARED_SECRETS; i++) {
CachedSharedSecret &entry = sharedSecretCache[i]; CachedSharedSecret &entry = sharedSecretCache[i];
if (entry.lookup_key == lookupKey) { if (entry.lookup_key == lookupKey) {
@ -275,14 +275,14 @@ bool CryptoEngine::setCryptoSharedSecret(meshtastic_UserLite_public_key_t pubkey
return true; return true;
} }
if (oldestEntry.lookup_key == 0) { if (sharedSecretCache[oldestIndex].lookup_key == 0) {
// We already have a valid slot to insert into. Keep looking for a cache hit. // We already have a valid slot to insert into. Keep looking for a cache hit.
continue; continue;
} }
if (entry.lookup_key == 0) { if (entry.lookup_key == 0) {
// This entry is empty. We can insert into it later, if needed. // This entry is empty. We can insert into it later, if needed.
oldestEntry = entry; oldestIndex = i;
continue; continue;
} }
@ -295,7 +295,7 @@ bool CryptoEngine::setCryptoSharedSecret(meshtastic_UserLite_public_key_t pubkey
delta = uint16_t(0x100) + now - entry.last_used; delta = uint16_t(0x100) + now - entry.last_used;
} }
if (delta > oldestDelta) { if (delta > oldestDelta) {
oldestEntry = entry; oldestIndex = i;
oldestDelta = delta; oldestDelta = delta;
} }
} }
@ -307,6 +307,7 @@ bool CryptoEngine::setCryptoSharedSecret(meshtastic_UserLite_public_key_t pubkey
hash(shared_key, 32); hash(shared_key, 32);
// Insert the calculated shared secret into the cache, overwriting an old entry if needed. // Insert the calculated shared secret into the cache, overwriting an old entry if needed.
CachedSharedSecret &oldestEntry = sharedSecretCache[oldestIndex];
oldestEntry.lookup_key = lookupKey; oldestEntry.lookup_key = lookupKey;
oldestEntry.last_used = now; oldestEntry.last_used = now;
memcpy(oldestEntry.shared_secret, shared_key, 32); memcpy(oldestEntry.shared_secret, shared_key, 32);