From ec7b453c7ad9f5215252791fc7d6f33a6fb0d53d Mon Sep 17 00:00:00 2001
From: gjelsoe <36234524+gjelsoe@users.noreply.github.com>
Date: Thu, 14 Nov 2024 16:38:19 +0100
Subject: [PATCH] more userPrefs.h

Added PKI Admin keys to userPrefs.h
---
 src/mesh/NodeDB.cpp | 27 ++++++++++++++++++++++++---
 userPrefs.h         | 16 +++++++++-------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 7f051ae167..d0b106f221 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -407,9 +407,30 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
     config.lora.ignore_mqtt = false;
 #endif
 #ifdef USERPREFS_USE_ADMIN_KEY
-    memcpy(config.security.admin_key[0].bytes, USERPREFS_ADMIN_KEY, 32);
-    config.security.admin_key[0].size = 32;
-    config.security.admin_key_count = 1;
+    // Initialize admin_key_count to zero
+    byte numAdminKeys = 0;
+
+// Check if USERPREFS_ADMIN_KEY_0 is non-empty
+if (sizeof(USERPREFS_ADMIN_KEY_0) > 0) {
+    memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_0, 32);
+    config.security.admin_key[numAdminKeys].size = 32;
+    numAdminKeys++;
+}
+
+// Check if USERPREFS_ADMIN_KEY_1 is non-empty
+if (sizeof(USERPREFS_ADMIN_KEY_1) > 0) {
+    memcpy(config.security.admin_key[numAdminKeys].bytes, USERPREFS_ADMIN_KEY_1, 32);
+    config.security.admin_key[numAdminKeys].size = 32;
+    numAdminKeys++;
+}
+
+// Check if USERPREFS_ADMIN_KEY_2 is non-empty
+if (sizeof(USERPREFS_ADMIN_KEY_2) > 0) {
+    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;
+    numAdminKeys++;
+}
+    config.security.admin_key_count = numAdminKeys;
 #endif
     if (shouldPreserveKey) {
         config.security.private_key.size = 32;
diff --git a/userPrefs.h b/userPrefs.h
index c105e6b523..24331d4136 100644
--- a/userPrefs.h
+++ b/userPrefs.h
@@ -28,13 +28,13 @@
 // #define USERPREFS_CHANNEL_0_PRECISION 14
 // #define USERPREFS_CHANNEL_0_UPLINK_ENABLED true
 // #define USERPREFS_CHANNEL_0_DOWNLINK_ENABLED true
-/*
+
 #define USERPREFS_CHANNEL_1_PSK \
     {                                                                                                                            \
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                                               \
     }
-*/
+
 // #define USERPREFS_CHANNEL_1_NAME "REPLACEME"
 // #define USERPREFS_CHANNEL_1_PRECISION 14
 // #define USERPREFS_CHANNEL_1_UPLINK_ENABLED true
@@ -68,12 +68,14 @@ static unsigned char icon_bits[] = {
     0x98, 0x3F, 0xF0, 0x23, 0x00, 0xFC, 0x0F, 0xE0, 0x7F, 0x00, 0xFC, 0x03, 0x80, 0xFF, 0x01, 0xFC, 0x00, 0x00, 0x3E, 0x00, 0x70,
     0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00};
 */
-/*
+
 #define USERPREFS_USE_ADMIN_KEY 1
-static unsigned char USERPREFS_ADMIN_KEY[] = {0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6,
-                                       0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a,
-                                       0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c};
-*/
+static unsigned char USERPREFS_ADMIN_KEY_0[] = {0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6,
+                                                0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a,
+                                                0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c};
+static unsigned char USERPREFS_ADMIN_KEY_1[] = {};
+static unsigned char USERPREFS_ADMIN_KEY_2[] = {};
+
 
 /*
  * USERPREF_FIXED_GPS_LAT and USERPREF_FIXED_GPS_LON must be set, USERPREF_FIXED_GPS_ALT is optional