Skip to content

Commit

Permalink
Merge pull request #34 from LedgerHQ/xch/wake-up
Browse files Browse the repository at this point in the history
Add missing UX_WAKE_UP for FIDO2 flows
  • Loading branch information
xchapron-ledger authored Jan 10, 2024
2 parents 0931304 + 15103ce commit a2b24d7
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ PATH_APP_LOAD_PARAMS += "5262163'" # int("PKS".encode("ascii").hex(), 16)

APPVERSION_M=1
APPVERSION_N=5
APPVERSION_P=0
APPVERSION_P=1
APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)

ICON_NANOS=icons/icon_security_key_nanos.gif
Expand Down
2 changes: 2 additions & 0 deletions src/ctap2_get_assertion_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ void ctap2_get_assertion_ux(ctap2_ux_state_t state) {

ctap2UxState = state;

UX_WAKE_UP();

#if defined(HAVE_BAGL)
ux_step = 0;
#elif defined(HAVE_NBGL)
Expand Down
2 changes: 2 additions & 0 deletions src/ctap2_make_credential_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ void ctap2_make_credential_ux(void) {

ctap2_ux_get_display_user();

UX_WAKE_UP();

#if defined(HAVE_BAGL)
ux_flow_init(0,
(ctap2RegisterData->residentKey ? ux_ctap2_make_cred_resident_flow
Expand Down
4 changes: 4 additions & 0 deletions src/ctap2_reset_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ UX_FLOW(ux_ctap2_reset_flow,
void ctap2_reset_ux(void) {
ctap2UxState = CTAP2_UX_STATE_RESET;

UX_WAKE_UP();

ux_flow_init(0, ux_ctap2_reset_flow, NULL);
}

Expand All @@ -75,6 +77,8 @@ void ctap2_reset_ux(void) {
void ctap2_reset_ux(void) {
ctap2UxState = CTAP2_UX_STATE_RESET;

UX_WAKE_UP();

io_seproxyhal_play_tune(TUNE_LOOK_AT_ME);

nbgl_useCaseChoice(&C_warning64px,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/speculos/snapshots/nanos/test_u2f_screens_idle/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/speculos/snapshots/nanox/test_u2f_screens_idle/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/speculos/snapshots/stax/test_fido_screens_settings/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/speculos/snapshots/stax/test_u2f_screens_idle/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a2b24d7

Please sign in to comment.