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

Update NodeDB.cpp

Browse Source 
Trunk
This commit is contained in:
gjelsoe 2024-11-16 17:20:59 +01:00 committed by Tom Fifield
parent 4b0fc47359
commit 65f91b8d14
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mesh/NodeDB.cpp
View File

@ -410,26 +410,26 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
// Initialize admin_key_count to zero // Initialize admin_key_count to zero
byte numAdminKeys = 0; byte numAdminKeys = 0;
// Check if USERPREFS_ADMIN_KEY_0 is non-empty // Check if USERPREFS_ADMIN_KEY_0 is non-empty
if (sizeof(USERPREFS_ADMIN_KEY_0) > 0) { if (sizeof(USERPREFS_ADMIN_KEY_0) > 0) {
memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_0, 32); memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_0, 32);
config.security.admin_key[numAdminKeys].size = 32; config.security.admin_key[numAdminKeys].size = 32;
numAdminKeys++; numAdminKeys++;
} }
// Check if USERPREFS_ADMIN_KEY_1 is non-empty // Check if USERPREFS_ADMIN_KEY_1 is non-empty
if (sizeof(USERPREFS_ADMIN_KEY_1) > 0) { if (sizeof(USERPREFS_ADMIN_KEY_1) > 0) {
memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_1, 32); memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_1, 32);
config.security.admin_key[numAdminKeys].size = 32; config.security.admin_key[numAdminKeys].size = 32;
numAdminKeys++; numAdminKeys++;
} }
// Check if USERPREFS_ADMIN_KEY_2 is non-empty // Check if USERPREFS_ADMIN_KEY_2 is non-empty
if (sizeof(USERPREFS_ADMIN_KEY_2) > 0) { if (sizeof(USERPREFS_ADMIN_KEY_2) > 0) {
memcpy(config.security.admin_key[config.security.admin_key_count].bytes, USERPREFS_ADMIN_KEY_2, 32); memcpy(config.security.admin_key[config.security.admin_key_count].bytes, USERPREFS_ADMIN_KEY_2, 32);
config.security.admin_key[config.security.admin_key_count].size = 32; config.security.admin_key[config.security.admin_key_count].size = 32;
numAdminKeys++; numAdminKeys++;
} }
config.security.admin_key_count = numAdminKeys; config.security.admin_key_count = numAdminKeys;
#endif #endif
if (shouldPreserveKey) { if (shouldPreserveKey) {