From 143836501912f4874f1c101b13f6b9d231d3d033 Mon Sep 17 00:00:00 2001 From: Aido Date: Fri, 14 Jun 2024 20:45:59 +0100 Subject: [PATCH 1/3] Give a warning if a user chooses 1-of-m shares when m > 1 Fixes aido/app-seed=tool#36 --- CHANGELOG.md | 9 ++---- Makefile | 4 +-- src/nano/ux_nano_sskr.c | 37 +++++++++++++++++----- src/ux_common/onboarding_seed_sskr.c | 46 +++++++++++++++------------- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff275f45..b9e34f13 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,16 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.7.4-rc.2] - 2024-06-03 +## [1.7.4] - 2024-06-17 ### Fixed -- Use `cx_bn_gf2_n_mul()` syscall instead of internal `bn_gf2_n_mul()` on LNSP and LNX - Ensure result does not overlap with operands in calls to `cx_bn_gf2_n_mul()` - -## [1.7.4-rc.1] - 2024-05-31 - -### Fixed -- Use internal `bn_gf2_n_mul()` instead of `cx_bn_gf2_n_mul()` syscall on all devices +- Give a warning if a user chooses 1-of-m shares when m > 1 ## [1.7.3] - 2024-05-29 diff --git a/Makefile b/Makefile index e589d201..812c4600 100755 --- a/Makefile +++ b/Makefile @@ -31,8 +31,8 @@ APPVERSION_N = 7 APPVERSION_P = 4 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)" -APPVERSION_RC = 2 -ifdef APPVERSION_RC +APPVERSION_RC = 0 +ifneq ($(APPVERSION_RC), 0) APPVERSION := $(APPVERSION)-rc.$(APPVERSION_RC) endif diff --git a/src/nano/ux_nano_sskr.c b/src/nano/ux_nano_sskr.c index 1d647390..7bbd48d7 100644 --- a/src/nano/ux_nano_sskr.c +++ b/src/nano/ux_nano_sskr.c @@ -118,8 +118,8 @@ void generate_sskr(void) { io_seproxyhal_general_status(); #endif - PRINTF("generate_sskr threshold: %d\n", G_bolos_ux_context.sskr_group_descriptor[0][0]); - PRINTF("generate_sskr sskr number: %d\n", G_bolos_ux_context.sskr_group_descriptor[0][1]); + PRINTF("SSKR threshold selected: %d\n", G_bolos_ux_context.sskr_group_descriptor[0][0]); + PRINTF("SSKR share count selected: %d\n", G_bolos_ux_context.sskr_group_descriptor[0][1]); G_bolos_ux_context.sskr_share_count = 0; G_bolos_ux_context.sskr_words_buffer_length = 0; @@ -133,7 +133,7 @@ void generate_sskr(void) { &G_bolos_ux_context.sskr_words_buffer_length); if (G_bolos_ux_context.sskr_share_count > 0) { - PRINTF("SSKR share_count from generate_sskr(): \n%d\n", + PRINTF("SSKR share_count from generate_sskr(): %d\n", G_bolos_ux_context.sskr_share_count); for (uint8_t share = 0; share < G_bolos_ux_context.sskr_share_count; share++) { PRINTF("SSKR share %d:\n", share + 1); @@ -149,6 +149,24 @@ void generate_sskr(void) { ux_flow_init(0, dynamic_flow, NULL); } +UX_STEP_NOCB(ux_threshold_warn_step_1, + pnn, + { + &C_icon_warning, + "1-of-m shares", + "where m > 1", + }); + +UX_STEP_NOCB(ux_threshold_warn_step_2, + pbb, + { + &C_icon_warning, + "Not", + "Supported", + }); + +UX_FLOW(ux_threshold_warn_flow, &ux_threshold_warn_step_1, &ux_threshold_warn_step_2, &step_sskr_clean_exit); + const char* const sskr_descriptor_values[] = {"1", "2", "3", @@ -179,13 +197,18 @@ const char* sskr_threshold_getter(unsigned int idx) { void sskr_threshold_selector(unsigned int idx) { G_bolos_ux_context.sskr_group_descriptor[0][0] = idx + 1; + if (G_bolos_ux_context.sskr_group_descriptor[0][0] == 1 && + G_bolos_ux_context.sskr_group_descriptor[0][1] > 1) { + ux_flow_init(0, ux_threshold_warn_flow, NULL);; + } else { #if defined(TARGET_NANOS) - // Display processing warning to user - screen_processing_init(); - G_bolos_ux_context.processing = PROCESSING_GENERATE_SSKR; + // Display processing warning to user + screen_processing_init(); + G_bolos_ux_context.processing = PROCESSING_GENERATE_SSKR; #else - generate_sskr(); + generate_sskr(); #endif + } } UX_STEP_NOCB(ux_threshold_instruction_step, nn, {"Select", "threshold"}); diff --git a/src/ux_common/onboarding_seed_sskr.c b/src/ux_common/onboarding_seed_sskr.c index 9ee1ed9d..559a0fc2 100644 --- a/src/ux_common/onboarding_seed_sskr.c +++ b/src/ux_common/onboarding_seed_sskr.c @@ -17,18 +17,18 @@ #error "What kind of system is this?" #endif -unsigned int bolos_ux_sskr_size_get(uint8_t bip39_onboarding_kind, - uint8_t groups_threshold, - unsigned int *group_descriptor, - uint8_t groups_len, - uint8_t *share_len) { +int16_t bolos_ux_sskr_size_get(uint8_t bip39_onboarding_kind, + uint8_t groups_threshold, + unsigned int *group_descriptor, + uint8_t groups_len, + uint8_t *share_len) { sskr_group_descriptor_t groups[SSKR_MAX_GROUP_COUNT]; for (uint8_t i = 0; i < groups_len; i++) { groups[i].threshold = *(group_descriptor + i * sizeof(*(group_descriptor)) / groups_len); groups[i].count = *(group_descriptor + 1 + i * sizeof(*(group_descriptor)) / groups_len); } - unsigned int share_count_expected = sskr_count_shards(groups_threshold, groups, groups_len); + int16_t share_count_expected = sskr_count_shards(groups_threshold, groups, groups_len); *share_len = bip39_onboarding_kind * 4 / 3 + SSKR_METADATA_LENGTH_BYTES; return share_count_expected; @@ -93,7 +93,7 @@ unsigned int bolos_ux_sskr_generate(uint8_t groups_threshold, unsigned char *share_buffer, unsigned int share_buffer_len, uint8_t share_len_expected, - uint8_t share_count_expected) { + int16_t share_count_expected) { sskr_group_descriptor_t groups[SSKR_MAX_GROUP_COUNT]; for (uint8_t i = 0; i < (uint8_t) groups_len; i++) { @@ -108,24 +108,28 @@ unsigned int bolos_ux_sskr_generate(uint8_t groups_threshold, PRINTF("SSKR generate input:\n %.*H\n", seed_len, seed); // convert seed to SSKR shares - int share_count = sskr_generate_shards(groups_threshold, - groups, - groups_len, - seed, - seed_len, - share_len, - share_buffer, - share_buffer_len, - cx_rng); - - if ((share_count < 0) || ((unsigned int) share_count != share_count_expected) || + int16_t share_count = sskr_generate_shards(groups_threshold, + groups, + groups_len, + seed, + seed_len, + share_len, + share_buffer, + share_buffer_len, + cx_rng); + + PRINTF("SSKR share count expected: %d\n", share_count_expected); + PRINTF("SSKR share count returned: %d\n", share_count); + PRINTF("SSKR share length expected: %d\n", share_len_expected); + PRINTF("SSKR share length returned: %d\n", *share_len); + + if ((share_count < 0) || (share_count != share_count_expected) || (*share_len != share_len_expected)) { memzero(&share_buffer, sizeof(share_buffer)); return 0; } + PRINTF("SSKR generate output:\n %.*H\n", share_buffer_len, share_buffer); - PRINTF("SSKR share count:\n %d\n", share_count); - PRINTF("SSKR share length :\n %d\n", *share_len); return share_count; } @@ -173,7 +177,7 @@ unsigned int bolos_ux_bip39_to_sskr_convert(unsigned char *bip39_words_buffer, uint8_t groups_len = 1; uint8_t groups_threshold = 1; uint8_t share_len_expected = 0; - uint8_t share_count_expected = bolos_ux_sskr_size_get(bip39_onboarding_kind, + int16_t share_count_expected = bolos_ux_sskr_size_get(bip39_onboarding_kind, groups_threshold, group_descriptor, groups_len, From 8675c55b4db0cb26a2367b0d387e2172b8725c71 Mon Sep 17 00:00:00 2001 From: Aido Date: Wed, 19 Jun 2024 14:49:30 +0100 Subject: [PATCH 2/3] Use CBOR tag for version 2 sskr version 2 sskr uses IANA registered CBOR tag #6.40309 updated from deprecared version 1 crypto-sskr tag #309 --- CHANGELOG.md | 3 +- src/nano/ux_nano_sskr.c | 34 +- src/ux_common/onboarding_seed_sskr.c | 6 +- tests/deprecated/nanos-sskr-128bit.json | 768 ++++++++++++++++-------- tests/deprecated/nanos-sskr-128bit.test | 124 ++-- tests/deprecated/nanos-sskr-256bit.json | 716 +++++++++++----------- tests/deprecated/nanos-sskr-256bit.test | 124 ++-- tests/functional/test_bip39_12word.py | 6 +- tests/functional/test_bip39_18word.py | 6 +- tests/functional/test_bip39_24word.py | 6 +- tests/functional/test_sskr_128bit.py | 118 ++-- tests/functional/test_sskr_256bit.py | 124 ++-- tests/unit/tests/roundtrip.c | 18 +- tests/unit/tests/sskr.c | 12 +- tests/unit/tests/sss.c | 12 +- 15 files changed, 1193 insertions(+), 884 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e34f13..d41d5dfa 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.7.4] - 2024-06-17 +## [1.7.4] - 2024-06-19 ### Fixed - Ensure result does not overlap with operands in calls to `cx_bn_gf2_n_mul()` - Give a warning if a user chooses 1-of-m shares when m > 1 +- Use CBOR tag for version 2 `sskr` ## [1.7.3] - 2024-05-29 diff --git a/src/nano/ux_nano_sskr.c b/src/nano/ux_nano_sskr.c index 7bbd48d7..341ab564 100644 --- a/src/nano/ux_nano_sskr.c +++ b/src/nano/ux_nano_sskr.c @@ -133,8 +133,7 @@ void generate_sskr(void) { &G_bolos_ux_context.sskr_words_buffer_length); if (G_bolos_ux_context.sskr_share_count > 0) { - PRINTF("SSKR share_count from generate_sskr(): %d\n", - G_bolos_ux_context.sskr_share_count); + PRINTF("SSKR share_count from generate_sskr(): %d\n", G_bolos_ux_context.sskr_share_count); for (uint8_t share = 0; share < G_bolos_ux_context.sskr_share_count; share++) { PRINTF("SSKR share %d:\n", share + 1); PRINTF( @@ -150,22 +149,25 @@ void generate_sskr(void) { } UX_STEP_NOCB(ux_threshold_warn_step_1, - pnn, - { - &C_icon_warning, - "1-of-m shares", - "where m > 1", - }); + pnn, + { + &C_icon_warning, + "1-of-m shares", + "where m > 1", + }); UX_STEP_NOCB(ux_threshold_warn_step_2, - pbb, - { - &C_icon_warning, - "Not", - "Supported", - }); + pbb, + { + &C_icon_warning, + "Not", + "Supported", + }); -UX_FLOW(ux_threshold_warn_flow, &ux_threshold_warn_step_1, &ux_threshold_warn_step_2, &step_sskr_clean_exit); +UX_FLOW(ux_threshold_warn_flow, + &ux_threshold_warn_step_1, + &ux_threshold_warn_step_2, + &step_sskr_clean_exit); const char* const sskr_descriptor_values[] = {"1", "2", @@ -199,7 +201,7 @@ void sskr_threshold_selector(unsigned int idx) { if (G_bolos_ux_context.sskr_group_descriptor[0][0] == 1 && G_bolos_ux_context.sskr_group_descriptor[0][1] > 1) { - ux_flow_init(0, ux_threshold_warn_flow, NULL);; + ux_flow_init(0, ux_threshold_warn_flow, NULL); } else { #if defined(TARGET_NANOS) // Display processing warning to user diff --git a/src/ux_common/onboarding_seed_sskr.c b/src/ux_common/onboarding_seed_sskr.c index 559a0fc2..0c5774c9 100644 --- a/src/ux_common/onboarding_seed_sskr.c +++ b/src/ux_common/onboarding_seed_sskr.c @@ -199,10 +199,10 @@ unsigned int bolos_ux_bip39_to_sskr_convert(unsigned char *bip39_words_buffer, share_count_expected); memzero(seed_buffer, sizeof(seed_buffer)); if (*share_count > 0) { - // CBOR Tag #309 is D9 0135 + // CBOR Tag #6.40309 is D9 9D75 // CBOR Major type 2 is 0x40 // (see https://www.rfc-editor.org/rfc/rfc8949#name-major-types) - uint8_t cbor[] = {0xD9, 0x01, 0x35, 0x40, 0x00}; + uint8_t cbor[] = {0xD9, 0x9D, 0x75, 0x40, 0x00}; size_t cbor_len = sizeof(cbor); if (share_len < 24) { cbor[3] |= (share_len & 0x1F); @@ -258,7 +258,7 @@ unsigned int bolos_ux_bip39_to_sskr_convert(unsigned char *bip39_words_buffer, unsigned int bolos_ux_sskr_hex_check(unsigned char *mnemonic_hex, unsigned int mnemonic_length, unsigned int sskr_shares_count) { - uint8_t cbor[] = {0xD9, 0x01, 0x35}; // CBOR tag + uint8_t cbor[] = {0xD9, 0x9D, 0x75}; // CBOR Tag #6.40309 is D9 9D75 uint32_t checksum = 0; uint8_t checksum_len = sizeof(checksum); diff --git a/tests/deprecated/nanos-sskr-128bit.json b/tests/deprecated/nanos-sskr-128bit.json index d0d99e83..2ce37c43 100755 --- a/tests/deprecated/nanos-sskr-128bit.json +++ b/tests/deprecated/nanos-sskr-128bit.json @@ -267,9 +267,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -277,9 +282,104 @@ ], [ "button", - 1, + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -315,6 +415,46 @@ 2, false ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], [ "button", 1, @@ -397,9 +537,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -407,9 +552,24 @@ ], [ "button", - 1, + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -435,11 +595,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -1500,66 +1670,6 @@ 1, true ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, - true - ], [ "button", 2, @@ -4475,11 +4585,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -4525,11 +4645,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -4545,21 +4675,41 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -4577,9 +4727,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4587,9 +4742,14 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -4597,9 +4757,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4607,9 +4772,14 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -4647,9 +4817,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4657,9 +4832,14 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -4667,9 +4847,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4677,9 +4862,14 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -4695,41 +4885,81 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -4827,9 +5057,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4837,9 +5072,24 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -4915,6 +5165,16 @@ 2, false ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], [ "button", 1, @@ -4940,16 +5200,31 @@ 1, true ], + [ + "button", + 2, + true + ], [ "button", 1, false ], + [ + "button", + 2, + false + ], [ "button", 1, true ], + [ + "button", + 2, + true + ], [ "button", 1, @@ -4957,19 +5232,29 @@ ], [ "button", - 1, + 2, + false + ], + [ + "button", + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -4977,9 +5262,14 @@ ], [ "button", - 1, + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -5047,18 +5337,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5092,17 +5382,17 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ @@ -5110,11 +5400,21 @@ 1, true ], + [ + "button", + 2, + true + ], [ "button", 1, false ], + [ + "button", + 2, + false + ], [ "button", 1, @@ -5152,43 +5452,43 @@ ], [ "button", - 2, - true + 1, + false ], [ "button", 1, - false + true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -5202,27 +5502,27 @@ ], [ "button", - 2, - true + 1, + false ], [ "button", 1, - false + true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ @@ -5272,73 +5572,73 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5397,18 +5697,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5435,21 +5735,11 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -5457,18 +5747,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5527,18 +5817,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5587,18 +5877,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -5625,11 +5915,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -9287,18 +9587,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9357,18 +9657,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9377,18 +9677,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9447,18 +9747,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9477,18 +9777,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9497,18 +9797,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9517,52 +9817,52 @@ ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ @@ -9572,17 +9872,17 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ @@ -9590,11 +9890,21 @@ 1, true ], + [ + "button", + 2, + true + ], [ "button", 1, false ], + [ + "button", + 2, + false + ], [ "button", 1, @@ -9617,18 +9927,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9645,21 +9955,11 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -9677,18 +9977,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9767,18 +10067,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9787,18 +10087,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -9827,39 +10127,29 @@ ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -9907,18 +10197,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9927,18 +10217,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -9997,18 +10287,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -10022,17 +10312,17 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ @@ -10075,7 +10365,7 @@ 2, false ] - ] + ] }, { "text": "SSKR Phrase", diff --git a/tests/deprecated/nanos-sskr-128bit.test b/tests/deprecated/nanos-sskr-128bit.test index 86acf2bb..57e7bd21 100644 --- a/tests/deprecated/nanos-sskr-128bit.test +++ b/tests/deprecated/nanos-sskr-128bit.test @@ -15,19 +15,37 @@ POST /button/left POST /button/both POST /button/both POST /button/both -POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/right POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/both POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/both POST /button/both POST /button/both POST /button/both @@ -103,12 +121,6 @@ POST /button/right POST /button/right POST /button/both POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left POST /button/both POST /button/left POST /button/left @@ -340,6 +352,19 @@ POST /button/both POST /button/both POST /button/right POST /button/right +POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/both +POST /button/right +POST /button/both +POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/right POST /button/right POST /button/right @@ -350,13 +375,13 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/both POST /button/both +POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/right @@ -371,70 +396,76 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right +POST /button/both POST /button/right POST /button/both POST /button/both -POST /button/left -POST /button/left -POST /button/left POST /button/both POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right -POST /button/both -POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left +POST /button/right +POST /button/right POST /button/both POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/both POST /button/both +POST /button/both +POST /button/left +POST /button/left +POST /button/left POST /button/left POST /button/left POST /button/left +POST /button/both POST /button/left POST /button/left POST /button/left POST /button/both +POST /button/both +POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/right POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/both -POST /button/both -POST /button/both POST /button/right POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/both POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both +POST /button/right +POST /button/right +POST /button/right POST /button/right POST /button/right POST /button/right POST /button/both POST /button/both POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/right @@ -708,6 +739,15 @@ POST /button/right POST /button/right POST /button/both POST /button/both +POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/both +POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/right @@ -719,28 +759,26 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/both POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left +POST /button/both POST /button/both POST /button/right POST /button/right POST /button/right +POST /button/right +POST /button/right POST /button/both POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/both POST /button/both POST /button/both POST /button/right @@ -752,23 +790,15 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/left -POST /button/left -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right POST /button/right POST /button/both -POST /button/left -POST /button/left POST /button/both POST /button/both diff --git a/tests/deprecated/nanos-sskr-256bit.json b/tests/deprecated/nanos-sskr-256bit.json index d1e6bd15..e8c27f7b 100755 --- a/tests/deprecated/nanos-sskr-256bit.json +++ b/tests/deprecated/nanos-sskr-256bit.json @@ -55,7 +55,6 @@ 2, false ], - [ [ "button", 1, @@ -76,6 +75,7 @@ 2, false ], + [ "button", 1, true @@ -267,9 +267,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -277,9 +282,104 @@ ], [ "button", - 1, + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -315,6 +415,46 @@ 2, false ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, + false + ], [ "button", 1, @@ -397,9 +537,14 @@ ], [ "button", - 1, + 2, true ], + [ + "button", + 2, + false + ], [ "button", 2, @@ -407,9 +552,24 @@ ], [ "button", - 1, + 2, + false + ], + [ + "button", + 2, + true + ], + [ + "button", + 2, false ], + [ + "button", + 2, + true + ], [ "button", 2, @@ -435,11 +595,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -7222,37 +7392,37 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ @@ -7262,17 +7432,17 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ @@ -7282,17 +7452,17 @@ ], [ "button", - 1, - false + 2, + true ], [ "button", 1, - true + false ], [ "button", - 1, + 2, false ], [ @@ -7317,32 +7487,22 @@ ], [ "button", - 2, - true - ], - [ - "button", - 2, - false - ], - [ - "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ @@ -7361,15 +7521,6 @@ false ], [ - "button", - 2, - false - ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -7567,18 +7718,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -7597,18 +7748,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -7617,32 +7768,12 @@ ], [ "button", - 2, - true - ], - [ - "button", - 2, - false - ], - [ - "button", - 2, - true - ], - [ - "button", - 2, - false - ], - [ - "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ @@ -7650,21 +7781,11 @@ 1, true ], - [ - "button", - 2, - true - ], [ "button", 1, false ], - [ - "button", - 2, - false - ], [ "button", 1, @@ -7707,14 +7828,9 @@ ], [ "button", - 2, + 1, true ], - [ - "button", - 2, - false - ], [ "button", 2, @@ -7722,14 +7838,9 @@ ], [ "button", - 2, + 1, false ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -7737,14 +7848,9 @@ ], [ "button", - 2, + 1, true ], - [ - "button", - 2, - false - ], [ "button", 2, @@ -7752,14 +7858,9 @@ ], [ "button", - 2, + 1, false ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -7787,14 +7888,9 @@ ], [ "button", - 2, + 1, true ], - [ - "button", - 2, - false - ], [ "button", 2, @@ -7802,14 +7898,9 @@ ], [ "button", - 2, + 1, false ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -7855,16 +7946,6 @@ 2, false ], - [ - "button", - 2, - true - ], - [ - "button", - 2, - false - ], [ "button", 1, @@ -7907,74 +7988,69 @@ ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], - [ - "button", - 2, - false - ], [ "button", 2, @@ -7982,14 +8058,9 @@ ], [ "button", - 2, + 1, false ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -8000,11 +8071,6 @@ 1, true ], - [ - "button", - 2, - true - ], [ "button", 1, @@ -8012,27 +8078,22 @@ ], [ "button", - 2, - false - ], - [ - "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ @@ -8057,14 +8118,9 @@ ], [ "button", - 2, + 1, true ], - [ - "button", - 2, - false - ], [ "button", 2, @@ -8072,14 +8128,9 @@ ], [ "button", - 2, + 1, false ], - [ - "button", - 2, - true - ], [ "button", 2, @@ -8105,21 +8156,11 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -8127,79 +8168,69 @@ ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -8275,61 +8306,31 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -8387,18 +8388,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -8447,18 +8448,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -8485,11 +8486,21 @@ 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -9985,9 +9996,9 @@ 1, false ], - [ "button", 1, + 1, true ], [ @@ -10337,9 +10348,9 @@ ], [ "button", - 1, true ], + "button", [ "button", 2, @@ -10956,7 +10967,7 @@ false ], [ - "button", + [ 2, true ], @@ -11365,7 +11376,7 @@ 2, true ], - [ + true "button", 1, false @@ -11458,7 +11469,6 @@ [ "button", 2, - true ], [ "button", @@ -11495,6 +11505,7 @@ 2, true ], + "button", [ "button", 1, @@ -11731,9 +11742,9 @@ false ], [ - "button", 2, false + "button", ], [ "button", @@ -12211,7 +12222,7 @@ true ], [ - "button", + 2, 2, false ], @@ -12337,9 +12348,9 @@ ], [ "button", - 2, true ], + "button", [ "button", 2, @@ -12556,7 +12567,6 @@ false ], [ - "button", 2, true ], @@ -12579,6 +12589,7 @@ "button", 1, true + "button", ], [ "button", @@ -12796,9 +12807,9 @@ false ], [ - "button", 2, true + false ], [ "button", @@ -12898,7 +12909,6 @@ [ "button", 1, - false ], [ "button", @@ -14607,22 +14617,12 @@ ], [ "button", - 1, - true - ], - [ - "button", - 1, - false - ], - [ - "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ @@ -14632,12 +14632,7 @@ ], [ "button", - 1, - false - ], - [ - "button", - 1, + 2, true ], [ @@ -14647,22 +14642,17 @@ ], [ "button", - 1, - true - ], - [ - "button", - 1, + 2, false ], [ "button", - 1, + 2, true ], [ "button", - 1, + 2, false ], [ @@ -14672,12 +14662,7 @@ ], [ "button", - 1, - false - ], - [ - "button", - 1, + 2, true ], [ @@ -14687,12 +14672,7 @@ ], [ "button", - 1, - true - ], - [ - "button", - 1, + 2, false ], [ @@ -14735,21 +14715,11 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -14787,18 +14757,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -14865,21 +14835,11 @@ 2, false ], - [ - "button", - 1, - true - ], [ "button", 2, true ], - [ - "button", - 1, - false - ], [ "button", 2, @@ -14947,29 +14907,39 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", 2, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -15007,18 +14977,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -15067,18 +15037,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -15117,18 +15087,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -15137,18 +15107,18 @@ ], [ "button", - 2, + 1, true ], [ "button", 2, - false + true ], [ "button", - 2, - true + 1, + false ], [ "button", @@ -15157,49 +15127,59 @@ ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], [ "button", - 2, + 1, true ], [ "button", - 2, + 1, false ], + [ + "button", + 1, + true + ], [ "button", 2, true ], + [ + "button", + 1, + false + ], [ "button", 2, @@ -15247,18 +15227,18 @@ ], [ "button", - 1, + 2, true ], [ "button", 2, - true + false ], [ "button", - 1, - false + 2, + true ], [ "button", @@ -15285,33 +15265,7 @@ 2, false ] - ] - }, - { - "text": "SSKR Phrase", - "x": 41, - "y": 3, - "text": "is correct", - "x": 41, - "y": 17, - "conditions": [ - [ - "seen", - false - ] ], - "actions": [ - [ - "button", - 2, - true - ], - [ - "button", - 2, - false - ] - ] }, { "text": "Quit", diff --git a/tests/deprecated/nanos-sskr-256bit.test b/tests/deprecated/nanos-sskr-256bit.test index af06effa..dbb549e2 100644 --- a/tests/deprecated/nanos-sskr-256bit.test +++ b/tests/deprecated/nanos-sskr-256bit.test @@ -15,19 +15,37 @@ POST /button/left POST /button/both POST /button/both POST /button/both -POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/right POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/both POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right +POST /button/right +POST /button/right +POST /button/right +POST /button/both POST /button/both POST /button/both POST /button/both @@ -548,24 +566,18 @@ POST /button/right POST /button/both POST /button/both POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left POST /button/both POST /button/right POST /button/right -POST /button/right POST /button/both -POST /button/right -POST /button/right POST /button/both POST /button/both +POST /button/left +POST /button/left +POST /button/both POST /button/right +POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/right @@ -579,34 +591,39 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/right -POST /button/right POST /button/right POST /button/right POST /button/right POST /button/right POST /button/both +POST /button/left +POST /button/left POST /button/both POST /button/right POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right -POST /button/right +POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/both -POST /button/right +POST /button/both POST /button/right POST /button/right POST /button/both POST /button/both +POST /button/left +POST /button/left +POST /button/left +POST /button/left +POST /button/left +POST /button/left +POST /button/both +POST /button/left +POST /button/left +POST /button/left +POST /button/both +POST /button/both +POST /button/both POST /button/right POST /button/right POST /button/right @@ -616,43 +633,28 @@ POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both -POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/both -POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/right -POST /button/both -POST /button/both POST /button/both POST /button/both POST /button/right -POST /button/both -POST /button/both -POST /button/both POST /button/right POST /button/right POST /button/right POST /button/right -POST /button/both POST /button/right POST /button/right POST /button/right +POST /button/right +POST /button/right +POST /button/both POST /button/both POST /button/both POST /button/both @@ -1112,26 +1114,9 @@ POST /button/both POST /button/right POST /button/both POST /button/both -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/left -POST /button/both -POST /button/both -POST /button/both -POST /button/right -POST /button/right POST /button/right POST /button/both POST /button/right -POST /button/right -POST /button/right -POST /button/right POST /button/both POST /button/both POST /button/both @@ -1147,8 +1132,11 @@ POST /button/right POST /button/right POST /button/both POST /button/right -POST /button/right POST /button/both +POST /button/right +POST /button/right +POST /button/right +POST /button/right POST /button/both POST /button/both POST /button/right @@ -1158,11 +1146,21 @@ POST /button/right POST /button/right POST /button/right POST /button/right +POST /button/both POST /button/right POST /button/right +POST /button/both POST /button/right +POST /button/both +POST /button/both +POST /button/left +POST /button/left +POST /button/left +POST /button/left +POST /button/both POST /button/right POST /button/right POST /button/both -POST /button/both +POST /button/right +POST /button/right POST /button/both diff --git a/tests/functional/test_bip39_12word.py b/tests/functional/test_bip39_12word.py index 8db4b7c1..fa7906e7 100755 --- a/tests/functional/test_bip39_12word.py +++ b/tests/functional/test_bip39_12word.py @@ -267,11 +267,11 @@ def nanos_bip39_12word(backend, navigator): NavInsID.BOTH_CLICK], screen_change_before_first_instruction=False) backend.wait_for_text_on_screen("SSKR Share #1", 5) - backend.wait_for_text_on_screen("tuna acid epic gyro", 1) + backend.wait_for_text_on_screen("tuna next keep gyro", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #2", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic gyro", 1) + backend.wait_for_text_on_screen("tuna next keep gyro", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #3", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic gyro", 1) + backend.wait_for_text_on_screen("tuna next keep gyro", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "Quit", 20, screen_change_before_first_instruction=False) @mark.use_on_backend("speculos") diff --git a/tests/functional/test_bip39_18word.py b/tests/functional/test_bip39_18word.py index 8183de7c..acaba63a 100755 --- a/tests/functional/test_bip39_18word.py +++ b/tests/functional/test_bip39_18word.py @@ -367,11 +367,11 @@ def nanos_bip39_18word(backend, navigator): NavInsID.BOTH_CLICK], screen_change_before_first_instruction=False) backend.wait_for_text_on_screen("SSKR Share #1", 5) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #2", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #3", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "Quit", 20, screen_change_before_first_instruction=False) @mark.use_on_backend("speculos") diff --git a/tests/functional/test_bip39_24word.py b/tests/functional/test_bip39_24word.py index 9b914697..1562685d 100755 --- a/tests/functional/test_bip39_24word.py +++ b/tests/functional/test_bip39_24word.py @@ -449,11 +449,11 @@ def nanos_bip39_24word(backend, navigator): NavInsID.BOTH_CLICK], screen_change_before_first_instruction=False) backend.wait_for_text_on_screen("SSKR Share #1", 5) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #2", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "SSKR Share #3", 20, screen_change_before_first_instruction=False) - backend.wait_for_text_on_screen("tuna acid epic hard", 1) + backend.wait_for_text_on_screen("tuna next keep hard", 1) navigator.navigate_until_text(NavInsID.RIGHT_CLICK, [], "Quit", 20, screen_change_before_first_instruction=False) @mark.use_on_backend("speculos") diff --git a/tests/functional/test_sskr_128bit.py b/tests/functional/test_sskr_128bit.py index bbf61ebb..3bd30a59 100755 --- a/tests/functional/test_sskr_128bit.py +++ b/tests/functional/test_sskr_128bit.py @@ -31,22 +31,40 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, @@ -350,21 +368,34 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, @@ -381,70 +412,76 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, @@ -718,6 +755,15 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, @@ -729,28 +775,26 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, @@ -762,24 +806,16 @@ def nanos_sskr_128bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK ] diff --git a/tests/functional/test_sskr_256bit.py b/tests/functional/test_sskr_256bit.py index 3de2b270..71c365fe 100755 --- a/tests/functional/test_sskr_256bit.py +++ b/tests/functional/test_sskr_256bit.py @@ -31,19 +31,37 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, @@ -564,24 +582,18 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, @@ -595,34 +607,39 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, - NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, @@ -632,43 +649,28 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, @@ -1128,26 +1130,9 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.LEFT_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, @@ -1163,8 +1148,11 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, - NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, @@ -1174,13 +1162,23 @@ def nanos_sskr_256bit(backend, navigator): NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.BOTH_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.LEFT_CLICK, + NavInsID.BOTH_CLICK, NavInsID.RIGHT_CLICK, NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK, - NavInsID.BOTH_CLICK, + NavInsID.RIGHT_CLICK, + NavInsID.RIGHT_CLICK, NavInsID.BOTH_CLICK ] navigator.navigate(instructions, screen_change_before_first_instruction=False) diff --git a/tests/unit/tests/roundtrip.c b/tests/unit/tests/roundtrip.c index 8e74e4c9..9d69ed29 100644 --- a/tests/unit/tests/roundtrip.c +++ b/tests/unit/tests/roundtrip.c @@ -32,23 +32,23 @@ * However, these tests use a fake random number generator so the shares generated by the tests will * be predictable. The shares generated by these tests will consistently be: * -* tuna acid epic hard data acid able able acid able +* tuna next keep hard data acid able able acid able * zoom bias rock door luau surf jowl able soap visa * legs user puff warm hope code gyro webs brag tuna * gear iced miss flew flew twin curl body road skew -* hope peck peck echo able tiny +* hope peck bulb iced cyan runs * -* tuna acid epic hard data acid able able acid acid +* tuna next keep hard data acid able able acid acid * quiz main lazy note rock love code scar task zero * blue rock slot real mint roof ruby quad glow cook * curl taco aqua meow fund cook kick luck belt knob -* wand oboe lava urge help exit +* wand oboe film many keys guru * -* tuna acid epic hard data acid able able acid also +* tuna next keep hard data acid able able acid also * iron calm task help warm fizz loud next skew undo * ruin cash holy guru tomb fuel noon hang paid gems * note curl peck yank half gala maze duty task poem -* drum road film brew flew trip +* drum road lava flew huts quad */ #include @@ -71,12 +71,12 @@ const uint8_t bip39_hex[] = {0xE3, 0x95, 0x5C, 0xDA, 0x30, 0x47, 0x71, 0xC0, 0x1E, 0xD1, 0x4E, 0x8A, 0xAF, 0xA1, 0xAF, 0x13, 0x8B}; -uint8_t sskr_hex[] = {0xD9, 0x01, 0x35, 0x58, 0x25, 0x01, 0x00, 0x00, +uint8_t sskr_hex[] = {0xD9, 0x9D, 0x75, 0x58, 0x25, 0x01, 0x00, 0x00, 0x01, 0x00, 0xFF, 0x0F, 0xBB, 0x2A, 0x8B, 0xCC, 0x6F, 0x00, 0xC8, 0xE6, 0x83, 0xDF, 0xB0, 0xEB, 0x5F, 0x1C, 0x55, 0xEF, 0x12, 0xD9, 0x4B, 0x62, 0x97, 0x42, 0x42, 0xDA, 0x21, 0x11, 0xBA, 0xC6, - 0x5F, 0xAA, 0xD9, 0x01, 0x35, 0x58, 0x25, 0x01, + 0x5F, 0xAA, 0xD9, 0x9D, 0x75, 0x58, 0x25, 0x01, 0x00, 0x00, 0x01, 0x01, 0xB4, 0x8E, 0x81, 0x9F, 0xBB, 0x8A, 0x1C, 0xC3, 0xCF, 0xFB, 0x10, 0xBB, 0xC7, 0xB7, 0x96, 0xBC, 0xBD, 0xB3, 0x4F, 0x1E, @@ -93,7 +93,7 @@ unsigned int bolos_ux_sskr_hex_decode(unsigned char *mnemonic_hex, static void test_bip39_to_sskr(void **state) { - const unsigned char sskr_shares[] = "tuna acid epic hard data acid able able acid able zoom bias rock door luau surf jowl able soap visa legs user puff warm hope code gyro webs brag tuna gear iced miss flew flew twin curl body road skew hope peck peck echo able tinytuna acid epic hard data acid able able acid acid quiz main lazy note rock love code scar task zero blue rock slot real mint roof ruby quad glow cook curl taco aqua meow fund cook kick luck belt knob wand oboe lava urge help exittuna acid epic hard data acid able able acid also iron calm task help warm fizz loud next skew undo ruin cash holy guru tomb fuel noon hang paid gems note curl peck yank half gala maze duty task poem drum road film brew flew trip"; + const unsigned char sskr_shares[] = "tuna next keep hard data acid able able acid able zoom bias rock door luau surf jowl able soap visa legs user puff warm hope code gyro webs brag tuna gear iced miss flew flew twin curl body road skew hope peck bulb iced cyan runstuna next keep hard data acid able able acid acid quiz main lazy note rock love code scar task zero blue rock slot real mint roof ruby quad glow cook curl taco aqua meow fund cook kick luck belt knob wand oboe film many keys gurutuna next keep hard data acid able able acid also iron calm task help warm fizz loud next skew undo ruin cash holy guru tomb fuel noon hang paid gems note curl peck yank half gala maze duty task poem drum road lava flew huts quad"; unsigned char hex_buf[sizeof(bip39_hex)]; unsigned char sskr_words_buffer[sizeof(sskr_shares)]; diff --git a/tests/unit/tests/sskr.c b/tests/unit/tests/sskr.c index ffa7dd38..363c6225 100644 --- a/tests/unit/tests/sskr.c +++ b/tests/unit/tests/sskr.c @@ -32,23 +32,23 @@ * However, these tests use a fake random number generator so the shares generated by the tests will * be predictable. The shares generated by these tests will consistently be: * -* tuna acid epic hard data acid able able acid able +* tuna next keep hard data acid able able acid able * zoom bias rock door luau surf jowl able soap visa * legs user puff warm hope code gyro webs brag tuna * gear iced miss flew flew twin curl body road skew -* hope peck peck echo able tiny +* hope peck bulb iced cyan runs * -* tuna acid epic hard data acid able able acid acid +* tuna next keep hard data acid able able acid acid * quiz main lazy note rock love code scar task zero * blue rock slot real mint roof ruby quad glow cook * curl taco aqua meow fund cook kick luck belt knob -* wand oboe lava urge help exit +* wand oboe film many keys guru * -* tuna acid epic hard data acid able able acid also +* tuna next keep hard data acid able able acid also * iron calm task help warm fizz loud next skew undo * ruin cash holy guru tomb fuel noon hang paid gems * note curl peck yank half gala maze duty task poem -* drum road film brew flew trip +* drum road lava flew huts quad */ #include diff --git a/tests/unit/tests/sss.c b/tests/unit/tests/sss.c index dfe7cd8a..910a3b19 100644 --- a/tests/unit/tests/sss.c +++ b/tests/unit/tests/sss.c @@ -32,23 +32,23 @@ * However, these tests use a fake random number generator so the shares generated by the tests will * be predictable. The shares generated by these tests will consistently be: * -* tuna acid epic hard data acid able able acid able +* tuna next keep hard data acid able able acid able * zoom bias rock door luau surf jowl able soap visa * legs user puff warm hope code gyro webs brag tuna * gear iced miss flew flew twin curl body road skew -* hope peck peck echo able tiny +* hope peck bulb iced cyan runs * -* tuna acid epic hard data acid able able acid acid +* tuna next keep hard data acid able able acid acid * quiz main lazy note rock love code scar task zero * blue rock slot real mint roof ruby quad glow cook * curl taco aqua meow fund cook kick luck belt knob -* wand oboe lava urge help exit +* wand oboe film many keys guru * -* tuna acid epic hard data acid able able acid also +* tuna next keep hard data acid able able acid also * iron calm task help warm fizz loud next skew undo * ruin cash holy guru tomb fuel noon hang paid gems * note curl peck yank half gala maze duty task poem -* drum road film brew flew trip +* drum road lava flew huts quad */ #include From 57acc91f8e274e9851a477d9945d6d136f3d36df Mon Sep 17 00:00:00 2001 From: Aido Date: Thu, 20 Jun 2024 15:31:38 +0100 Subject: [PATCH 3/3] Update restrictions on when a release workflow is triggered Fixes aido/app-seed-tool#37 --- .github/workflows/release-workflow.yml | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 786092f2..5b68d722 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -10,7 +10,7 @@ on: jobs: create_release: name: Create Release - if: github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'v') + if: github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'v') && github.ref == 'refs/heads/develop' runs-on: ubuntu-latest permissions: contents: write diff --git a/CHANGELOG.md b/CHANGELOG.md index d41d5dfa..07702abe 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.7.4] - 2024-06-19 +## [1.7.4] - 2024-06-20 ### Fixed - Ensure result does not overlap with operands in calls to `cx_bn_gf2_n_mul()` - Give a warning if a user chooses 1-of-m shares when m > 1 - Use CBOR tag for version 2 `sskr` +- Update restrictions on when a release workflow is triggered ## [1.7.3] - 2024-05-29