mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-05 06:33:56 +00:00
Compare commits
No commits in common. "8d99850f8ab8045171e89641de3b1460425c6c67" and "39f4df7eb8b22dd593e44c26103d552d206c0b90" have entirely different histories.
8d99850f8a
...
39f4df7eb8
@ -913,7 +913,7 @@ void NodeDB::loadFromDisk()
|
|||||||
}
|
}
|
||||||
if (sum == 0) {
|
if (sum == 0) {
|
||||||
numAdminKeys += 1;
|
numAdminKeys += 1;
|
||||||
LOG_INFO("Admin 0 key zero. Loading hard coded key from user preferences.");
|
LOG_INFO("Admin 0 key zero. Loading hard coded key from user preferences.\n");
|
||||||
memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32);
|
memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32);
|
||||||
config.security.admin_key[0].size = 32;
|
config.security.admin_key[0].size = 32;
|
||||||
config.security.admin_key_count = numAdminKeys;
|
config.security.admin_key_count = numAdminKeys;
|
||||||
@ -928,7 +928,7 @@ void NodeDB::loadFromDisk()
|
|||||||
}
|
}
|
||||||
if (sum == 0) {
|
if (sum == 0) {
|
||||||
numAdminKeys += 1;
|
numAdminKeys += 1;
|
||||||
LOG_INFO("Admin 1 key zero. Loading hard coded key from user preferences.");
|
LOG_INFO("Admin 1 key zero. Loading hard coded key from user preferences.\n");
|
||||||
memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32);
|
memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32);
|
||||||
config.security.admin_key[1].size = 32;
|
config.security.admin_key[1].size = 32;
|
||||||
config.security.admin_key_count = numAdminKeys;
|
config.security.admin_key_count = numAdminKeys;
|
||||||
@ -943,7 +943,7 @@ void NodeDB::loadFromDisk()
|
|||||||
}
|
}
|
||||||
if (sum == 0) {
|
if (sum == 0) {
|
||||||
numAdminKeys += 1;
|
numAdminKeys += 1;
|
||||||
LOG_INFO("Admin 2 key zero. Loading hard coded key from user preferences.");
|
LOG_INFO("Admin 2 key zero. Loading hard coded key from user preferences.\n");
|
||||||
memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32);
|
memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32);
|
||||||
config.security.admin_key[2].size = 32;
|
config.security.admin_key[2].size = 32;
|
||||||
config.security.admin_key_count = numAdminKeys;
|
config.security.admin_key_count = numAdminKeys;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
[env:meshtastic-diy-v1]
|
[env:meshtastic-diy-v1]
|
||||||
extends = esp32_base
|
extends = esp32_base
|
||||||
board = esp32doit-devkit-v1
|
board = esp32doit-devkit-v1
|
||||||
board_level = extra
|
|
||||||
board_check = true
|
board_check = true
|
||||||
build_flags =
|
build_flags =
|
||||||
${esp32_base.build_flags}
|
${esp32_base.build_flags}
|
||||||
|
Loading…
Reference in New Issue
Block a user