Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-01-11 23:49:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fw: Use a bit string for allowed_commands

Browse Source 
For every state, define a constant bitstring with allowed commands and
check incoming command agains that.

Signed-off-by: Daniel Lublin <daniel@lublin.se>
This commit is contained in:
Michael Cardell Widerkrantz 2023-03-08 15:02:56 +01:00 committed by Daniel Lublin
parent 8edfdf9c36
commit d2240b3e0f
No known key found for this signature in database
GPG Key ID: 75BD0FEB8D3E7830
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/application_fpga/fw/tk1/main.c
View File

@ -142,6 +142,7 @@ enum state {
FW_STATE_LOADING, FW_STATE_LOADING,
FW_STATE_RUN, FW_STATE_RUN,
FW_STATE_FAIL, FW_STATE_FAIL,
FW_STATE_MAX,
}; };
int main() int main()
@ -158,23 +159,30 @@ int main()
enum state state = FW_STATE_INITIAL; enum state state = FW_STATE_INITIAL;
// Let the app know the function adddress for blake2s() // Let the app know the function adddress for blake2s()
*fw_blake2s_addr = (uint32_t)blake2s; *fw_blake2s_addr = (uint32_t)blake2s;
uint8_t command_allowed[FW_CMD_MAX] = {0}; const uint32_t command_allowed[FW_STATE_MAX] = {
// FW_STATE_INITIAL
1 << FW_CMD_NAME_VERSION |
1 << FW_CMD_LOAD_APP |
1 << FW_CMD_GET_UDI,
// FW_STATE_LOADING
1 << FW_CMD_NAME_VERSION |
0 << FW_CMD_LOAD_APP |
1 << FW_CMD_LOAD_APP_DATA |
1 << FW_CMD_GET_UDI,
// FW_STATE_RUN
0,
// FW_STATE_FAIL
0,
};
print_hw_version(namever); print_hw_version(namever);
// FW_STATE_INITIAL - but not resettable
command_allowed[FW_CMD_NAME_VERSION] = 1;
command_allowed[FW_CMD_LOAD_APP] = 1;
command_allowed[FW_CMD_GET_UDI] = 1;
for (;;) { for (;;) {
switch (state) { switch (state) {
case FW_STATE_INITIAL: case FW_STATE_INITIAL:
break; break;
case FW_STATE_LOADING: case FW_STATE_LOADING:
command_allowed[FW_CMD_LOAD_APP] = 0;
command_allowed[FW_CMD_LOAD_APP_DATA] = 1;
break; break;
case FW_STATE_RUN: case FW_STATE_RUN:
@ -252,7 +260,7 @@ int main()
// Min length is 1 byte so cmd[0] should always be here // Min length is 1 byte so cmd[0] should always be here
// Is this command allowed in current state? // Is this command allowed in current state?
assert(command_allowed[cmd[0]] == 1); assert(command_allowed[state] & (1 << cmd[0]));
switch (cmd[0]) { switch (cmd[0]) {
case FW_CMD_NAME_VERSION: case FW_CMD_NAME_VERSION: