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

Receive USS and hash into CDI

Browse Source 
- We're OK with USS not being loaded, and use an all-zero USS if so.
- We require USS to be loaded before app_size (if at all).
This commit is contained in:
Daniel Lublin 2022-09-21 10:39:53 +02:00 committed by Michael Cardell Widerkrantz
parent df67966d8f
commit 99efb78ed8
No known key found for this signature in database
GPG Key ID: D3DB3DDF57E704E5
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/application_fpga/fw/mta1_mkdf/main.c
View File

@ -71,12 +71,16 @@ int main()
uint8_t *loadaddr = (uint8_t *)APP_RAM_ADDR; uint8_t *loadaddr = (uint8_t *)APP_RAM_ADDR;
int left = 0; // Bytes left to read int left = 0; // Bytes left to read
int nbytes = 0; // Bytes to write to memory int nbytes = 0; // Bytes to write to memory
uint8_t uss[32];
uint32_t local_app_size = 0; uint32_t local_app_size = 0;
uint8_t in; uint8_t in;
uint8_t digest[32]; uint8_t digest[32];
print_hw_version(local_name0, local_name1, local_ver); print_hw_version(local_name0, local_name1, local_ver);
// If host does not load USS, we use an all zero USS
memset(uss, 0, 32);
for (;;) { for (;;) {
// blocking; fw flashing white while waiting for cmd // blocking; fw flashing white while waiting for cmd
in = readbyte_ledflash(LED_RED | LED_BLUE | LED_GREEN, 500000); in = readbyte_ledflash(LED_RED | LED_BLUE | LED_GREEN, 500000);
@ -117,6 +121,22 @@ int main()
fwreply(hdr, FW_RSP_NAME_VERSION, rsp); fwreply(hdr, FW_RSP_NAME_VERSION, rsp);
break; break;
case FW_CMD_LOAD_USS:
puts("request: load-uss\n");
if (hdr.len != 128 || *app_size != 0) {
// Bad cmd length, or app_size already set
rsp[0] = STATUS_BAD;
fwreply(hdr, FW_RSP_LOAD_USS, rsp);
break;
}
memcpy(uss, cmd + 1, 32);
rsp[0] = STATUS_OK;
fwreply(hdr, FW_RSP_LOAD_USS, rsp);
break;
case FW_CMD_LOAD_APP_SIZE: case FW_CMD_LOAD_APP_SIZE:
puts("request: load-app-size\n"); puts("request: load-app-size\n");
@ -173,7 +193,7 @@ int main()
left -= nbytes; left -= nbytes;
if (left == 0) { if (left == 0) {
uint8_t scratch[64]; uint8_t scratch[96];
puts("Fully loaded "); puts("Fully loaded ");
putinthex(*app_size); putinthex(*app_size);
@ -186,14 +206,15 @@ int main()
(const void *)*app_addr, *app_size); (const void *)*app_addr, *app_size);
print_digest(digest); print_digest(digest);
// CDI = hash(uds, hash(app)) // CDI = hash(uds, hash(app), uss)
uint32_t local_cdi[8]; uint32_t local_cdi[8];
// Only word aligned access to UDS // Only word aligned access to UDS
wordcpy(scratch, (void *)uds, 8); wordcpy(scratch, (void *)uds, 8);
memcpy(scratch + 32, digest, 32); memcpy(scratch + 32, digest, 32);
memcpy(scratch + 64, uss, 32);
blake2s((void *)local_cdi, 32, NULL, 0, blake2s((void *)local_cdi, 32, NULL, 0,
(const void *)scratch, 64); (const void *)scratch, 96);
// Only word aligned access to CDI // Only word aligned access to CDI
wordcpy((void *)cdi, (void *)local_cdi, 8); wordcpy((void *)cdi, (void *)local_cdi, 8);
} }

5
hw/application_fpga/fw/mta1_mkdf/proto.c
View File

@ -71,6 +71,11 @@ void fwreply(struct frame_header hdr, enum fwcmd rspcode, uint8_t *buf)
nbytes = 32; nbytes = 32;
break; break;
case FW_RSP_LOAD_USS:
len = LEN_4;
nbytes = 4;
break;
case FW_RSP_LOAD_APP_SIZE: case FW_RSP_LOAD_APP_SIZE:
len = LEN_4; len = LEN_4;
nbytes = 4; nbytes = 4;

5
hw/application_fpga/fw/mta1_mkdf/proto.h
View File

@ -35,7 +35,10 @@ enum fwcmd {
FW_CMD_RUN_APP = 0x07, FW_CMD_RUN_APP = 0x07,
FW_RSP_RUN_APP = 0x08, FW_RSP_RUN_APP = 0x08,
FW_CMD_GET_APP_DIGEST = 0x09, FW_CMD_GET_APP_DIGEST = 0x09,
FW_RSP_GET_APP_DIGEST = 0x10 FW_CMD_LOAD_USS = 0x0a,
FW_RSP_LOAD_USS = 0x0b,
/* ... */
FW_RSP_GET_APP_DIGEST = 0x10, // encoded as 0x10 for backwards compatibility
}; };
// clang-format on // clang-format on