Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2024-10-01 05:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fw: Move all variable declaration to first in scope

Browse Source
This commit is contained in:
Michael Cardell Widerkrantz 2023-03-09 16:08:51 +01:00 committed by Daniel Lublin
parent 9c766794db
commit ebf8a11ed0
No known key found for this signature in database
GPG Key ID: 75BD0FEB8D3E7830
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/application_fpga/fw/tk1/led.c
View File

@ -10,8 +10,8 @@
void forever_redflash() void forever_redflash()
{ {
static volatile uint32_t *led = (volatile uint32_t *)TK1_MMIO_TK1_LED; static volatile uint32_t *led = (volatile uint32_t *)TK1_MMIO_TK1_LED;
int led_on = 0; int led_on = 0;
for (;;) { for (;;) {
*led = led_on ? LED_RED : LED_BLACK; *led = led_on ? LED_RED : LED_BLACK;
for (volatile int i = 0; i < 800000; i++) { for (volatile int i = 0; i < 800000; i++) {

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

@ -115,10 +115,12 @@ static void compute_cdi(const uint8_t digest[32], const uint8_t use_uss,
{ {
uint32_t local_cdi[8]; uint32_t local_cdi[8];
blake2s_ctx secure_ctx; blake2s_ctx secure_ctx;
uint32_t rnd;
int blake2err;
// Prepare to sleep a random number of cycles before reading out UDS // Prepare to sleep a random number of cycles before reading out UDS
*timer_prescaler = 1; *timer_prescaler = 1;
uint32_t rnd = rnd_word(); rnd = rnd_word();
// Up to 65536 cycles // Up to 65536 cycles
rnd &= 0xffff; rnd &= 0xffff;
*timer = (rnd == 0 ? 1 : rnd); *timer = (rnd == 0 ? 1 : rnd);
@ -126,7 +128,7 @@ static void compute_cdi(const uint8_t digest[32], const uint8_t use_uss,
while (*timer_status & (1 << TK1_MMIO_TIMER_STATUS_RUNNING_BIT)) { while (*timer_status & (1 << TK1_MMIO_TIMER_STATUS_RUNNING_BIT)) {
} }
int blake2err = blake2s_init(&secure_ctx, 32, NULL, 0); blake2err = blake2s_init(&secure_ctx, 32, NULL, 0);
assert(blake2err == 0); assert(blake2err == 0);
// Update hash with UDS. This means UDS will live for a short // Update hash with UDS. This means UDS will live for a short
@ -177,7 +179,9 @@ static int initial_commands(const struct frame_header *hdr, const uint8_t *cmd,
return state; return state;
} break; } break;
case FW_CMD_GET_UDI: case FW_CMD_GET_UDI: {
uint32_t udi_words[2];
htif_puts("cmd: get-udi\n"); htif_puts("cmd: get-udi\n");
if (hdr->len != 1) { if (hdr->len != 1) {
// Bad cmd length // Bad cmd length
@ -187,15 +191,17 @@ static int initial_commands(const struct frame_header *hdr, const uint8_t *cmd,
} }
rsp[0] = STATUS_OK; rsp[0] = STATUS_OK;
uint32_t udi_words[2];
wordcpy_s(udi_words, 2, (void *)udi, 2); wordcpy_s(udi_words, 2, (void *)udi, 2);
memcpy_s(&rsp[1], CMDLEN_MAXBYTES - 1, udi_words, 2 * 4); memcpy_s(&rsp[1], CMDLEN_MAXBYTES - 1, udi_words, 2 * 4);
fwreply(*hdr, FW_RSP_GET_UDI, rsp); fwreply(*hdr, FW_RSP_GET_UDI, rsp);
// state unchanged // state unchanged
return state; return state;
break; } break;
case FW_CMD_LOAD_APP: {
uint32_t local_app_size;
case FW_CMD_LOAD_APP:
htif_puts("cmd: load-app(size, uss)\n"); htif_puts("cmd: load-app(size, uss)\n");
if (hdr->len != 512) { if (hdr->len != 512) {
// Bad length // Bad length
@ -205,7 +211,7 @@ static int initial_commands(const struct frame_header *hdr, const uint8_t *cmd,
} }
// cmd[1..4] contains the size. // cmd[1..4] contains the size.
uint32_t local_app_size = local_app_size =
cmd[1] + (cmd[2] << 8) + (cmd[3] << 16) + (cmd[4] << 24); cmd[1] + (cmd[2] << 8) + (cmd[3] << 16) + (cmd[4] << 24);
htif_puts("app size: "); htif_puts("app size: ");
@ -238,7 +244,7 @@ static int initial_commands(const struct frame_header *hdr, const uint8_t *cmd,
ctx->left = *app_size; ctx->left = *app_size;
return FW_STATE_LOADING; return FW_STATE_LOADING;
break; } break;
default: default:
htif_puts("Got unknown firmware cmd: 0x"); htif_puts("Got unknown firmware cmd: 0x");
@ -253,6 +259,7 @@ static int loading_commands(const struct frame_header *hdr, const uint8_t *cmd,
enum state state, struct context *ctx) enum state state, struct context *ctx)
{ {
uint8_t rsp[CMDLEN_MAXBYTES] = {0}; uint8_t rsp[CMDLEN_MAXBYTES] = {0};
int nbytes;
switch (cmd[0]) { switch (cmd[0]) {
case FW_CMD_LOAD_APP_DATA: case FW_CMD_LOAD_APP_DATA:
@ -264,7 +271,6 @@ static int loading_commands(const struct frame_header *hdr, const uint8_t *cmd,
return state; return state;
} }
int nbytes;
if (ctx->left > (512 - 1)) { if (ctx->left > (512 - 1)) {
nbytes = 512 - 1; nbytes = 512 - 1;
} else { } else {