Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2024-09-30 05:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fw: Move scramble RAM to own function

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

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

@ -356,37 +356,43 @@ static void run(const struct context *ctx)
__builtin_unreachable(); __builtin_unreachable();
} }
int main() void scramble_ram()
{ {
uint32_t *ram = (uint32_t *)(TK1_RAM_BASE);
uint32_t rnd = rnd_word();
uint32_t rnd_incr = rnd_word();
// Set RAM address and data scrambling values // Set RAM address and data scrambling values
*ram_aslr = rnd_word(); *ram_aslr = rnd_word();
*ram_scramble = rnd_word(); *ram_scramble = rnd_word();
// Fill RAM with random data (FW does not use RAM, has its stack in // Fill RAM with random data (FW does not use RAM, has its stack in
// FW_RAM) // FW_RAM)
uint32_t *loadaddrw = (uint32_t *)(TK1_RAM_BASE);
uint32_t rnd = rnd_word();
uint32_t rnd_incr = rnd_word();
for (uint32_t w = 0; w < TK1_RAM_SIZE / 4; w++) { for (uint32_t w = 0; w < TK1_RAM_SIZE / 4; w++) {
loadaddrw[w] = rnd; ram[w] = rnd;
rnd += rnd_incr; rnd += rnd_incr;
} }
// Set new scrambling values, for all use of RAM by app // Set new scrambling values, for all use of RAM by app
*ram_aslr = rnd_word(); *ram_aslr = rnd_word();
*ram_scramble = rnd_word(); *ram_scramble = rnd_word();
}
int main()
{
struct context ctx = {0}; struct context ctx = {0};
struct frame_header hdr; // Used in both directions struct frame_header hdr; // Used in both directions
uint8_t cmd[CMDLEN_MAXBYTES]; uint8_t cmd[CMDLEN_MAXBYTES];
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;
// print_hw_version(namever);
ctx.loadaddr = (uint8_t *)TK1_RAM_BASE; ctx.loadaddr = (uint8_t *)TK1_RAM_BASE;
ctx.use_uss = FALSE; ctx.use_uss = FALSE;
scramble_ram();
for (;;) { for (;;) {
switch (state) { switch (state) {
case FW_STATE_INITIAL: case FW_STATE_INITIAL: