From 9eb66bf59d8270c413c1559b1b79721d6c8b46c8 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Fri, 5 Aug 2011 03:18:43 +0200
Subject: [PATCH] Refactor all secrets into separate file

---
 firmware/SECRETS                      | 14 ++++++++++++++
 firmware/applications/serial/serial.c | 10 ++--------
 firmware/funk/mesh.c                  |  4 +---
 firmware/funk/openbeacon.c            |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 firmware/SECRETS

diff --git a/firmware/SECRETS b/firmware/SECRETS
new file mode 100644
index 0000000..4a05441
--- /dev/null
+++ b/firmware/SECRETS
@@ -0,0 +1,14 @@
+#ifndef _SECRETS_
+#define _SECRETS_
+
+static uint32_t const meshkey[4] = {
+    0x00000042, 0x000005ec, 0x00000023, 0x00000005
+};
+static const uint32_t openbeaconkey[4] = {
+	0xB4595344, 0xD3E119B6, 0xA814D0EC, 0xEFF5A24E 
+};
+static uint32_t const remotekey[4] = {
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+};
+
+#endif
diff --git a/firmware/applications/serial/serial.c b/firmware/applications/serial/serial.c
index 287001a..e780fbf 100644
--- a/firmware/applications/serial/serial.c
+++ b/firmware/applications/serial/serial.c
@@ -23,13 +23,7 @@
 #define BEACON_CHANNEL 81
 #define BEACON_MAC     "\x1\x2\x3\x2\1"
 
-uint32_t const beaconkey[4] = {
-        0xB4595344,0xD3E119B6,0xA814D0EC,0xEFF5A24E
-};
-uint32_t remotekey[4] = {
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
-};
-extern uint32_t const meshkey[4];
+#include "SECRETS"
 
 char funkencrypt=0;
 
@@ -167,7 +161,7 @@ int process(char * input){
             config.maclen[0]=0x10;
             config.nrmacs=1;
             nrf_config_set(&config);
-            memcpy(thekey,beaconkey,sizeof(thekey));
+            memcpy(thekey,openbeaconkey,sizeof(thekey));
             funkencrypt=1;
         }else if(input[1]=='?'){
             nrf_config_get(&config);
diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c
index 4727a0b..f7e8de9 100644
--- a/firmware/funk/mesh.c
+++ b/firmware/funk/mesh.c
@@ -14,9 +14,7 @@ char meshmsg=0;
 char meshnice=0;
 MPKT meshbuffer[MESHBUFSIZE];
 
-uint32_t const meshkey[4] = {
-    0x00000042, 0x000005ec, 0x00000023, 0x00000005
-};
+#include "SECRETS"
 
 struct NRF_CFG oldconfig;
 
diff --git a/firmware/funk/openbeacon.c b/firmware/funk/openbeacon.c
index 9efe4d9..642c4a9 100644
--- a/firmware/funk/openbeacon.c
+++ b/firmware/funk/openbeacon.c
@@ -7,7 +7,7 @@
 #include "basic/uuid.h"
 
 //const uint32_t key[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
-const uint32_t openbeaconkey[4] = { 0xB4595344,0xD3E119B6,0xA814D0EC,0xEFF5A24E };
+#include "SECRETS"
 const uint8_t useencryption = 1;
 const uint8_t mac[5] = {1,2,3,2,1};