From cd1673c35863fd1b1305008141cc28f78ed1350a Mon Sep 17 00:00:00 2001 From: n4l5u0r <59141606+n4l5u0r@users.noreply.github.com> Date: Thu, 5 Dec 2024 21:31:33 +0100 Subject: [PATCH] fix: tests ok --- docker-compose.yml | 2 +- src/app_main.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cdfa0304..2fa21272 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,6 @@ services: - "5000:5000" # api - "40000:40000" # apdu environment: - - GDB_DIRECTORY_LIST="/speculos/sources/common:/speculos/sources:/speculos/sources/apdu:/speculos/sources/handler:/speculos/sources/helper:/speculos/sources/transaction:/speculos/sources/ui" + - GDB_DIRECTORY_LIST="/speculos/sources/common:/speculos/sources/common/ui:/speculos/sources:/speculos/sources/apdu:/speculos/sources/handler:/speculos/sources/helper:/speculos/sources/transaction:/speculos/sources/ui" command: "-d --model nanosp build/nanos2/bin/app.elf --display headless --apdu-port 40000" # Add `--vnc-password ""` for macos users to use built-in vnc client. \ No newline at end of file diff --git a/src/app_main.c b/src/app_main.c index 1d4c2c72..d8d1d750 100644 --- a/src/app_main.c +++ b/src/app_main.c @@ -62,12 +62,9 @@ void app_main() { // Structured APDU command command_t cmd; - io_init(); - - ui_menu_main(); - explicit_bzero(&global_tx_state, sizeof(global_tx_state)); + ui_menu_main(); // Initialize the NVM data if required if (N_storage.initialized != 0x01) { @@ -101,19 +98,12 @@ void app_main() { cmd.lc, cmd.data); - // uint8_t INS = G_io_apdu_buffer[OFFSET_INS]; - // uint8_t p1 = G_io_apdu_buffer[OFFSET_P1]; - // uint8_t p2 = G_io_apdu_buffer[OFFSET_P2]; - // uint8_t lc = G_io_apdu_buffer[OFFSET_LC]; - // uint8_t *cdata = G_io_apdu_buffer + OFFSET_CDATA; - bool isInitialCall = false; if (global_tx_state.currentInstruction == -1) { - explicit_bzero(&global_tx_state, sizeof(global_tx_state)); - global_tx_state.currentInstruction = (int) cmd.ins; + explicit_bzero(&global, sizeof(global)); + global_tx_state.currentInstruction = cmd.ins; isInitialCall = true; } - // else if (global_tx_state.currentInstruction != cmd.ins) { // // Caller attempted to switch instruction in the middle // // of a multi command flow. This is not allowed, as in the