From 9eb66bf59d8270c413c1559b1b79721d6c8b46c8 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 03:18:43 +0200 Subject: [PATCH 1/5] 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}; From f810a9c5b6e2d0d2bc96b37f4d4e52230e23da35 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 03:46:15 +0200 Subject: [PATCH 2/5] Add clean ffconf.h for final --- firmware/filesystem/ffconf.h-final | 188 +++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 firmware/filesystem/ffconf.h-final diff --git a/firmware/filesystem/ffconf.h-final b/firmware/filesystem/ffconf.h-final new file mode 100644 index 0000000..6db022d --- /dev/null +++ b/firmware/filesystem/ffconf.h-final @@ -0,0 +1,188 @@ +/*---------------------------------------------------------------------------/ +/ FatFs - FAT file system module configuration file R0.08b (C)ChaN, 2011 +/----------------------------------------------------------------------------/ +/ +/ CAUTION! Do not forget to make clean the project after any changes to +/ the configuration options. +/ +/----------------------------------------------------------------------------*/ +#ifndef _FFCONF +#define _FFCONF 8237 /* Revision ID */ + + +/*---------------------------------------------------------------------------/ +/ Function and Buffer Configurations +/----------------------------------------------------------------------------*/ + +#define _FS_TINY 1 /* 0:Normal or 1:Tiny */ +/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system +/ object instead of the sector buffer in the individual file object for file +/ data transfer. This reduces memory consumption 512 bytes each file object. */ + + +#define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */ +/* Setting _FS_READONLY to 1 defines read only configuration. This removes +/ writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename, +/ f_truncate and useless f_getfree. */ + + +#define _FS_MINIMIZE 1 /* 0 to 3 */ +/* The _FS_MINIMIZE option defines minimization level to remove some functions. +/ +/ 0: Full function. +/ 1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename +/ are removed. +/ 2: f_opendir and f_readdir are removed in addition to 1. +/ 3: f_lseek is removed in addition to 2. */ + + +#define _USE_STRFUNC 0 /* 0:Disable or 1/2:Enable */ +/* To enable string functions, set _USE_STRFUNC to 1 or 2. */ + + +#define _USE_MKFS 0 /* 0:Disable or 1:Enable */ +/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */ + + +#define _USE_FORWARD 0 /* 0:Disable or 1:Enable */ +/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */ + + +#define _USE_FASTSEEK 0 /* 0:Disable or 1:Enable */ +/* To enable fast seek feature, set _USE_FASTSEEK to 1. */ + + + +/*---------------------------------------------------------------------------/ +/ Locale and Namespace Configurations +/----------------------------------------------------------------------------*/ + +#define _CODE_PAGE 1 +/* The _CODE_PAGE specifies the OEM code page to be used on the target system. +/ Incorrect setting of the code page can cause a file open failure. +/ +/ 932 - Japanese Shift-JIS (DBCS, OEM, Windows) +/ 936 - Simplified Chinese GBK (DBCS, OEM, Windows) +/ 949 - Korean (DBCS, OEM, Windows) +/ 950 - Traditional Chinese Big5 (DBCS, OEM, Windows) +/ 1250 - Central Europe (Windows) +/ 1251 - Cyrillic (Windows) +/ 1252 - Latin 1 (Windows) +/ 1253 - Greek (Windows) +/ 1254 - Turkish (Windows) +/ 1255 - Hebrew (Windows) +/ 1256 - Arabic (Windows) +/ 1257 - Baltic (Windows) +/ 1258 - Vietnam (OEM, Windows) +/ 437 - U.S. (OEM) +/ 720 - Arabic (OEM) +/ 737 - Greek (OEM) +/ 775 - Baltic (OEM) +/ 850 - Multilingual Latin 1 (OEM) +/ 858 - Multilingual Latin 1 + Euro (OEM) +/ 852 - Latin 2 (OEM) +/ 855 - Cyrillic (OEM) +/ 866 - Russian (OEM) +/ 857 - Turkish (OEM) +/ 862 - Hebrew (OEM) +/ 874 - Thai (OEM, Windows) +/ 1 - ASCII only (Valid for non LFN cfg.) +*/ + + +#define _USE_LFN 0 /* 0 to 3 */ +#define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */ +/* The _USE_LFN option switches the LFN support. +/ +/ 0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect. +/ 1: Enable LFN with static working buffer on the BSS. Always NOT reentrant. +/ 2: Enable LFN with dynamic working buffer on the STACK. +/ 3: Enable LFN with dynamic working buffer on the HEAP. +/ +/ The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN, +/ Unicode handling functions ff_convert() and ff_wtoupper() must be added +/ to the project. When enable to use heap, memory control functions +/ ff_memalloc() and ff_memfree() must be added to the project. */ + + +#define _LFN_UNICODE 0 /* 0:ANSI/OEM or 1:Unicode */ +/* To switch the character code set on FatFs API to Unicode, +/ enable LFN feature and set _LFN_UNICODE to 1. */ + + +#define _FS_RPATH 0 /* 0 to 2 */ +/* The _FS_RPATH option configures relative path feature. +/ +/ 0: Disable relative path feature and remove related functions. +/ 1: Enable relative path. f_chdrive() and f_chdir() are available. +/ 2: f_getcwd() is available in addition to 1. +/ +/ Note that output of the f_readdir fnction is affected by this option. */ + + + +/*---------------------------------------------------------------------------/ +/ Physical Drive Configurations +/----------------------------------------------------------------------------*/ + +#define _VOLUMES 1 +/* Number of volumes (logical drives) to be used. */ + + +#define _MAX_SS 512 /* 512, 1024, 2048 or 4096 */ +/* Maximum sector size to be handled. +/ Always set 512 for memory card and hard disk but a larger value may be +/ required for on-board flash memory, floppy disk and optical disk. +/ When _MAX_SS is larger than 512, it configures FatFs to variable sector size +/ and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */ + + +#define _MULTI_PARTITION 0 /* 0:Single partition or 1:Multiple partition */ +/* When set to 0, each volume is bound to the same physical drive number and +/ it can mount only first primaly partition. When it is set to 1, each volume +/ is tied to the partitions listed in VolToPart[]. */ + + +#define _USE_ERASE 0 /* 0:Disable or 1:Enable */ +/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command +/ should be added to the disk_ioctl functio. */ + + + +/*---------------------------------------------------------------------------/ +/ System Configurations +/----------------------------------------------------------------------------*/ + +#define _WORD_ACCESS 0 /* 0 or 1 */ +/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS +/ option defines which access method is used to the word data on the FAT volume. +/ +/ 0: Byte-by-byte access. +/ 1: Word access. Do not choose this unless following condition is met. +/ +/ When the byte order on the memory is big-endian or address miss-aligned word +/ access results incorrect behavior, the _WORD_ACCESS must be set to 0. +/ If it is not the case, the value can also be set to 1 to improve the +/ performance and code size. */ + + +/* A header file that defines sync object types on the O/S, such as +/ windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */ + +#define _FS_REENTRANT 0 /* 0:Disable or 1:Enable */ +#define _FS_TIMEOUT 1000 /* Timeout period in unit of time ticks */ +#define _SYNC_t HANDLE /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */ + +/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module. +/ +/ 0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect. +/ 1: Enable reentrancy. Also user provided synchronization handlers, +/ ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj +/ function must be added to the project. */ + + +#define _FS_SHARE 0 /* 0:Disable or >=1:Enable */ +/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value + defines how many files can be opened simultaneously. */ + +#endif /* _FFCONFIG */ From db1cfe6320677d923e9f47391581a8dd30e837fa Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 03:48:32 +0200 Subject: [PATCH 3/5] Script to build/gather all stuff for release --- firmware/release-all | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 firmware/release-all diff --git a/firmware/release-all b/firmware/release-all new file mode 100755 index 0000000..dd77057 --- /dev/null +++ b/firmware/release-all @@ -0,0 +1,61 @@ +#!/bin/sh -e + +TARG=../release + +if [ ! -d ../firmware ] ; then + echo Running from wrong directory. + exit 1 +fi + +cd ../firmware + +if [ -d $TARG ] ; then + echo Release dir already exists + echo please remove/move away + exit 1 +fi + +mkdir $TARG +mkdir $TARG/files + +echo "###" +echo "### Building initial" +echo "###" +git checkout filesystem/ffconf.h +make clean +make APP=initial +cp firmware.bin $TARG/initial.bin + +echo "###" +echo "### Building final" +echo "###" +cp filesystem/ffconf.h-final ffconf.h +make clean +./l0dable/mktable.pl +make APP=final +cp firmware.elf $TARG/final.elf +cp firmware.bin $TARG/final.bin + +echo "###" +echo "### Building crypto" +echo "###" +(cd ../tools/crypto && make) + +echo "###" +echo "### Gathering files" +echo "###" +cp ../tools/font/binary/*.f0n $TARG/files/ +cp ../tools/image/lcd/*.lcd $TARG/files/ + +echo "###" +echo "### Gathering/crypting loadables" +echo "###" +# XXX: add crypto stuff +(cd l0dable && make) +mv l0dable/*.c0d $TARG/files/ +mv l0dable/*.int $TARG/files/ +mv l0dable/*.nik $TARG/files/ + +echo "###" +echo "### Done. Yay!" +echo "###" From a402918828ab4a8ba90a769c3c8c517b06546416 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 10:25:31 +0200 Subject: [PATCH 4/5] reset font on return to menu --- firmware/basic/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c index 43a353f..a6b7fd5 100644 --- a/firmware/basic/menu.c +++ b/firmware/basic/menu.c @@ -78,6 +78,8 @@ void handleMenu(const struct MENU *the_menu) { case BTN_RIGHT: if (the_menu->entries[menuselection].callback!=NULL) the_menu->entries[menuselection].callback(); + + setSystemFont(); if (menuflags&MENU_JUSTONCE) return; @@ -91,6 +93,7 @@ void handleMenu(const struct MENU *the_menu) { if (the_menu->entries[menuselection].callback!=NULL) the_menu->entries[menuselection].callback(); lcdRefresh(); + setSystemFont(); if (menuflags&MENU_JUSTONCE) return; From b025dcf40967198be40944948951609ad1cb33fb Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 10:26:24 +0200 Subject: [PATCH 5/5] set FINAL define on release-build --- firmware/applications/Makefile | 4 ++++ firmware/release-all | 2 ++ 2 files changed, 6 insertions(+) diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index d8be88a..37b54ec 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -50,6 +50,10 @@ WRAPOBJ=$(WRAP).o WRAPSRC=$(WRAP).c LIBFILE=lib$(LIBNAME).a +ifeq "$(FINAL)" "y" +CFLAGS+=-DFINAL +endif + ########################################################################## # Compiler settings, parameters and flags ########################################################################## diff --git a/firmware/release-all b/firmware/release-all index dd77057..c4111c0 100755 --- a/firmware/release-all +++ b/firmware/release-all @@ -21,6 +21,8 @@ mkdir $TARG/files echo "###" echo "### Building initial" echo "###" + +export FINAL=y git checkout filesystem/ffconf.h make clean make APP=initial