Merge pull request #12 from blooo-io/fix/audit-fix

fix: audit fix
thesis · Oct 4, 2024 · 136559d · 136559d
2 parents 2d4a233 + 91ca8a3
commit 136559d
Show file tree

Hide file tree

Showing 185 changed files with 97 additions and 147 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ doc/html
 doc/latex
 
 tests/snapshots-tmp
+tests/bitcoin
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ include $(BOLOS_SDK)/Makefile.defines
 CURVE_APP_LOAD_PARAMS = secp256k1
 
 # Application allowed derivation paths.
-PATH_APP_LOAD_PARAMS = ""
+PATH_APP_LOAD_PARAMS = "44'/0'" "44'/1'" "84'/0'" "84'/1'" "86'/0'" "86'/1'"
 
 # Allowed SLIP21 paths
 PATH_SLIP21_APP_LOAD_PARAMS = "LEDGER-Wallet policy"
@@ -76,7 +76,6 @@ endif
 #     Application custom permissions   #
 ########################################
 HAVE_APPLICATION_FLAG_DERIVE_MASTER = 1
-HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1
 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 

diff --git a/src/boilerplate/dispatcher.h b/src/boilerplate/dispatcher.h
@@ -30,6 +30,15 @@ static inline void SEND_SW(struct dispatcher_context_s *dc, uint16_t sw) {
     dc->send_response();
 }
 
+#define SAFE_SEND_SW(dc, sw)                            \
+    do {                                                \
+        if (dc != NULL) {                               \
+            SEND_SW(dc, sw);                            \
+        } else {                                        \
+            PRINTF("Error: Null dispatcher context\n"); \
+        }                                               \
+    } while (0)
+
 static inline void SET_RESPONSE(struct dispatcher_context_s *dc,
                                 void *rdata,
                                 size_t rdata_len,

diff --git a/src/handler/withdraw.c b/src/handler/withdraw.c
diff --git a/src/ui/display.c b/src/ui/display.c
@@ -172,16 +172,6 @@ bool ui_validate_withdraw_data_and_confirm(dispatcher_context_t *context,
     return io_ui_process(context, SET_UX_DIRTY);
 }
 
-// bool ui_display_message_confirm(dispatcher_context_t *context) {
-// #ifdef HAVE_AUTOAPPROVE_FOR_PERF_TESTS
-//     return true;
-// #endif
-
-//     (void) context;
-//     ui_sign_message_confirm_flow();
-
-//     return io_ui_process(context, SET_UX_DIRTY);
-// }
 #ifdef HAVE_BAGL
 bool ui_display_register_wallet(dispatcher_context_t *context,
                                 const policy_map_wallet_header_t *wallet_header,

diff --git a/test_utils/authproxy.py b/test_utils/authproxy.py
@@ -47,7 +47,7 @@
 import time
 import urllib.parse
 
-HTTP_TIMEOUT = 30
+HTTP_TIMEOUT = 60
 USER_AGENT = "AuthServiceProxy/0.1"
 
 log = logging.getLogger("BitcoinRPC")

diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00000.png
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00001.png
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00000.png
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00001.png
diff --git a/...snapshots/flex/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png b/...snapshots/flex/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png
diff --git a/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png b/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png
diff --git a/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png b/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png
diff --git a/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png b/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png
diff --git a/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png b/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png b/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png b/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png
diff --git a/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png b/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png
diff --git a/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png b/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png
diff --git a/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png b/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png
diff --git a/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png b/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png b/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png b/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png b/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png b/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00003.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00006.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00006.png
diff --git a/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png b/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png
diff --git a/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00003.png b/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00003.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00003.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00003.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00003.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00003.png
diff --git a/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png b/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png
diff --git a/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00003.png b/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00000.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00001.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00004.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00004.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00003.png
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00003.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00003.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_0_1/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_0_1/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_0_1/00000.png
diff --git a/...napshots/flex/test_sighash_single_output_different_index_modified_0_0/00000.png b/...napshots/flex/test_sighash_single_output_different_index_modified_0_0/00000.png
diff --git a/...napshots/flex/test_sighash_single_output_different_index_modified_0_1/00000.png b/...napshots/flex/test_sighash_single_output_different_index_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_0_1/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_unsupported_0_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_unsupported_0_1/00000.png b/tests/snapshots/flex/test_sighash_unsupported_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_1/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_1/00000.png
diff --git a/...pshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png b/...pshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png
diff --git a/...pshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png b/...pshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png
diff --git a/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png b/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png
diff --git a/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png b/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png
diff --git a/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png b/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png
diff --git a/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png b/...napshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png
diff --git a/...ts/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0/00000.png b/...ts/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0/00000.png
diff --git a/...ts/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_1/00000.png b/...ts/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_2/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_3/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_3/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_2/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_3/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_3/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_withdraw_0_0/00000.png b/tests/snapshots/flex/test_sign_withdraw_0_0/00000.png
diff --git a/tests/snapshots/flex/test_sign_withdraw_0_0/00001.png b/tests/snapshots/flex/test_sign_withdraw_0_0/00001.png
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00006.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00006.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00003.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00004.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00004.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00005.png
diff --git a/tests/test_register_wallet.py b/tests/test_register_wallet.py
@@ -200,7 +200,7 @@ def test_register_wallet_unsupported_policy(navigator: Navigator, firmware: Firm
     assert DeviceException.exc.get(e.value.status) == NotSupportedError
     assert len(e.value.data) == 0
 
-
+@pytest.mark.timeout(0) # disable timeout
 def test_register_miniscript_long_policy(navigator: Navigator, firmware: Firmware, client:
                                          RaggerClient, test_name: str, speculos_globals):
     # This test makes sure that policies longer than 256 bytes work as expected on all devices
@@ -397,7 +397,7 @@ def test_register_wallet_tr_with_nums_keypath(navigator: Navigator, firmware: Fi
         instructions=register_wallet_instruction_approve(firmware),
         test_name=test_name)
 
-
+@pytest.mark.timeout(0) # disable timeout
 def test_register_wallet_tr_script_sortedmulti(navigator: Navigator, firmware: Firmware, client:
                                                RaggerClient, test_name: str, speculos_globals):
     run_register_test(navigator, client, speculos_globals, WalletPolicy(

diff --git a/tests/test_sign_psbt_with_sighash_types.py b/tests/test_sign_psbt_with_sighash_types.py
@@ -284,7 +284,6 @@ def test_sighash_single_3_ins_2_out(navigator: Navigator, firmware: Firmware, cl
     assert DeviceException.exc.get(e.value.status) == NotSupportedError
     assert len(e.value.data) == 0
 
-
 def test_sighash_all_anyone_sign(navigator: Navigator, firmware: Firmware, client: RaggerClient, test_name: str):
     psbt = open_psbt_from_file(f"{tests_root}/psbt/sighash/sighash-all-anyone-can-pay-sign.psbt")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,4 @@ doc/html
		doc/latex

		tests/snapshots-tmp
		tests/bitcoin