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

Backup / migrate pub private keys when upgrading to new files in 2.6 (#6096)

Browse Source 
* Save a backup of pub/private keys before factory reset

* Fix licensed mode warning

* Unlock spi on else file doesn't exist
This commit is contained in:
Ben Meadors 2025-02-19 17:54:56 -06:00 committed by GitHub
parent a7c4361d7c
commit 1961bcaf9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesh/NodeDB.cpp
View File

@ -972,6 +972,8 @@ void NodeDB::loadFromDisk()
// disk we will still factoryReset to restore things.
devicestate.version = 0;
meshtastic_Config_SecurityConfig backupSecurity = meshtastic_Config_SecurityConfig_init_zero;
#ifdef ARCH_ESP32
spiLock->lock();
// If the legacy deviceState exists, start over with a factory reset
@ -982,9 +984,21 @@ void NodeDB::loadFromDisk()
#ifdef FSCom
spiLock->lock();
if (FSCom.exists(legacyPrefFileName)) {
spiLock->unlock();
LOG_WARN("Legacy prefs version found, factory resetting");
if (loadProto(configFileName, meshtastic_LocalConfig_size, sizeof(meshtastic_LocalConfig), &meshtastic_LocalConfig_msg,
&config) == LoadFileResult::LOAD_SUCCESS &&
config.has_security && config.security.private_key.size > 0) {
LOG_DEBUG("Saving backup of security config and keys");
backupSecurity = config.security;
}
spiLock->lock();
rmDir("/prefs");
spiLock->unlock();
} else {
spiLock->unlock();
}
spiLock->unlock();
#endif
auto state = loadProto(nodeDatabaseFileName, getMaxNodesAllocatedSize(), sizeof(meshtastic_NodeDatabase),
&meshtastic_NodeDatabase_msg, &nodeDatabase);
@ -1034,6 +1048,11 @@ void NodeDB::loadFromDisk()
LOG_INFO("Loaded saved config version %d", config.version);
}
}
if (backupSecurity.private_key.size > 0) {
LOG_DEBUG("Restoring backup of security config");
config.security = backupSecurity;
saveToDisk(SEGMENT_CONFIG);
}
// Make sure we load hard coded admin keys even when the configuration file has none.
// Initialize admin_key_count to zero

3
src/modules/AdminModule.h
View File

@ -64,7 +64,8 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>, public Obser
void sendWarning(const char *message);
};
static constexpr char *licensedModeMessage = "Licensed mode activated, removing admin channel and encryption from all channels";
static constexpr const char *licensedModeMessage =
"Licensed mode activated, removing admin channel and encryption from all channels";
extern AdminModule *adminModule;