From 84876dc9715e8927f9556daa642bce6ec38afa15 Mon Sep 17 00:00:00 2001 From: Andrew Kozlik Date: Thu, 17 Feb 2022 17:16:42 +0100 Subject: [PATCH] feat(legacy): Add fsm_abortWorkflows(). --- .../firmware/.changelog.d/noissue.security.2 | 1 + legacy/firmware/config.c | 5 +- legacy/firmware/fsm.c | 9 ++ legacy/firmware/fsm.h | 2 + legacy/firmware/fsm_msg_common.h | 9 +- legacy/firmware/stellar.c | 136 +++++++++--------- legacy/firmware/stellar.h | 2 +- 7 files changed, 90 insertions(+), 74 deletions(-) create mode 100644 legacy/firmware/.changelog.d/noissue.security.2 diff --git a/legacy/firmware/.changelog.d/noissue.security.2 b/legacy/firmware/.changelog.d/noissue.security.2 new file mode 100644 index 000000000..893108612 --- /dev/null +++ b/legacy/firmware/.changelog.d/noissue.security.2 @@ -0,0 +1 @@ +Fix soft-lock bypass vulnerability. diff --git a/legacy/firmware/config.c b/legacy/firmware/config.c index 2eb0dfbb9..12a511070 100644 --- a/legacy/firmware/config.c +++ b/legacy/firmware/config.c @@ -431,7 +431,10 @@ void session_clearCache(Session *session) { session->seedCached = false; } -void config_lockDevice(void) { storage_lock(); } +void config_lockDevice(void) { + fsm_abortWorkflows(); + storage_lock(); +} static void get_u2froot_callback(uint32_t iter, uint32_t total) { layoutProgress(_("Updating"), 1000 * iter / total); diff --git a/legacy/firmware/fsm.c b/legacy/firmware/fsm.c index 6ed250815..122a4aada 100644 --- a/legacy/firmware/fsm.c +++ b/legacy/firmware/fsm.c @@ -376,6 +376,15 @@ void fsm_msgRebootToBootloader(void) { #endif } +void fsm_abortWorkflows(void) { + recovery_abort(); + signing_abort(); +#if !BITCOIN_ONLY + ethereum_signing_abort(); + stellar_signingAbort(); +#endif +} + bool fsm_layoutPathWarning(void) { layoutDialogSwipe(&bmp_icon_warning, _("Abort"), _("Continue"), NULL, _("Wrong address path"), _("for selected coin."), NULL, diff --git a/legacy/firmware/fsm.h b/legacy/firmware/fsm.h index d005e1cfc..5e9883e34 100644 --- a/legacy/firmware/fsm.h +++ b/legacy/firmware/fsm.h @@ -149,4 +149,6 @@ bool fsm_checkCoinPath(const CoinInfo *coin, InputScriptType script_type, uint32_t address_n_count, const uint32_t *address_n, bool has_multisig, bool show_warning); +void fsm_abortWorkflows(void); + #endif diff --git a/legacy/firmware/fsm_msg_common.h b/legacy/firmware/fsm_msg_common.h index fb9dec4ab..d031e91af 100644 --- a/legacy/firmware/fsm_msg_common.h +++ b/legacy/firmware/fsm_msg_common.h @@ -95,8 +95,7 @@ bool get_features(Features *resp) { } void fsm_msgInitialize(const Initialize *msg) { - recovery_abort(); - signing_abort(); + fsm_abortWorkflows(); uint8_t *session_id; if (msg && msg->has_session_id) { @@ -347,11 +346,7 @@ void fsm_msgBackupDevice(const BackupDevice *msg) { void fsm_msgCancel(const Cancel *msg) { (void)msg; - recovery_abort(); - signing_abort(); -#if !BITCOIN_ONLY - ethereum_signing_abort(); -#endif + fsm_abortWorkflows(); fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL); } diff --git a/legacy/firmware/stellar.c b/legacy/firmware/stellar.c index 55dde2337..4d2ebaf92 100644 --- a/legacy/firmware/stellar.c +++ b/legacy/firmware/stellar.c @@ -155,6 +155,22 @@ bool stellar_signingInit(const StellarSignTx *msg) { return true; } +void stellar_signingAbort(void) { + if (stellar_signing) { + stellar_signing = false; + layoutHome(); + } +} + +static void stellar_signingFail(const char *reason) { + if (!reason) { + reason = _("Unknown error"); + } + fsm_sendFailure(FailureType_Failure_ProcessError, reason); + + stellar_signingAbort(); +} + bool stellar_confirmSourceAccount(bool has_source_account, const char *str_account) { stellar_hashupdate_bool(has_source_account); @@ -174,7 +190,7 @@ bool stellar_confirmSourceAccount(bool has_source_account, str_addr_rows[0], str_addr_rows[1], str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -189,7 +205,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -199,7 +215,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) { // Validate new account and convert to bytes uint8_t new_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->new_account, new_account_bytes)) { - stellar_signingAbort(_("Invalid new account address")); + stellar_signingFail(_("Invalid new account address")); return false; } @@ -218,7 +234,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) { str_addr_rows[1], str_addr_rows[2], str_amount_line); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -236,7 +252,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -247,7 +263,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) { uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->destination_account, destination_account_bytes)) { - stellar_signingAbort(_("Invalid destination account")); + stellar_signingFail(_("Invalid destination account")); return false; } @@ -273,7 +289,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) { stellar_layoutTransactionDialog(str_pay_amount, str_asset_row, str_to, str_addr_rows[1], str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -295,7 +311,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp( if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -306,7 +322,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp( uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->destination_account, destination_account_bytes)) { - stellar_signingAbort(_("Invalid destination account")); + stellar_signingFail(_("Invalid destination account")); return false; } const char **str_dest_rows = @@ -343,7 +359,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp( stellar_layoutTransactionDialog(str_pay_amount, str_dest_asset, str_to, str_dest_rows[1], str_dest_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -360,7 +376,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp( _("This is the max"), _("amount debited from your"), _("account.")); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } // Note: no confirmation for intermediate steps since they don't impact the @@ -394,7 +410,7 @@ bool stellar_confirmPathPaymentStrictSendOp( if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -405,7 +421,7 @@ bool stellar_confirmPathPaymentStrictSendOp( uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->destination_account, destination_account_bytes)) { - stellar_signingAbort(_("Invalid destination account")); + stellar_signingFail(_("Invalid destination account")); return false; } const char **str_dest_rows = @@ -441,7 +457,7 @@ bool stellar_confirmPathPaymentStrictSendOp( stellar_layoutTransactionDialog(_("Path Pay at least"), str_pay_amount, str_dest_asset, str_to, str_dest_rows[1]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -458,7 +474,7 @@ bool stellar_confirmPathPaymentStrictSendOp( str_dest_rows[2], str_source_amount, str_send_asset, _("This is the amount debited"), _("from your account.")); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } // Note: no confirmation for intermediate steps since they don't impact the @@ -491,7 +507,7 @@ bool stellar_confirmManageBuyOfferOp(const StellarManageBuyOfferOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -551,7 +567,7 @@ bool stellar_confirmManageBuyOfferOp(const StellarManageBuyOfferOp *msg) { stellar_layoutTransactionDialog(str_offer, str_buying, str_buying_asset, str_selling, str_selling_asset); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -578,7 +594,7 @@ bool stellar_confirmManageSellOfferOp(const StellarManageSellOfferOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -637,7 +653,7 @@ bool stellar_confirmManageSellOfferOp(const StellarManageSellOfferOp *msg) { stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset, str_buying, str_buying_asset); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -665,7 +681,7 @@ bool stellar_confirmCreatePassiveSellOfferOp( if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -715,7 +731,7 @@ bool stellar_confirmCreatePassiveSellOfferOp( stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset, str_buying, str_buying_asset); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -740,7 +756,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -762,7 +778,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { uint8_t inflation_destination_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->inflation_destination_account, inflation_destination_account_bytes)) { - stellar_signingAbort(_("Invalid inflation destination account")); + stellar_signingFail(_("Invalid inflation destination account")); return false; } const char **str_addr_rows = @@ -771,7 +787,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(str_title, NULL, str_addr_rows[0], str_addr_rows[1], str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -786,7 +802,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { // Auth required if (msg->clear_flags > 7) { - stellar_signingAbort(_("Invalid flags")); + stellar_signingFail(_("Invalid flags")); return false; } if (msg->clear_flags & 0x01) { @@ -807,7 +823,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2], rows[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } memzero(rows, sizeof(rows)); @@ -824,7 +840,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { // Auth required if (msg->set_flags > 7) { - stellar_signingAbort(_("Invalid flags")); + stellar_signingFail(_("Invalid flags")); return false; } if (msg->set_flags & 0x01) { @@ -845,7 +861,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2], rows[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } memzero(rows, sizeof(rows)); @@ -919,7 +935,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2], rows[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } memzero(rows, sizeof(rows)); @@ -942,7 +958,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(str_title, rows[0], rows[1], NULL, NULL); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } memzero(rows, sizeof(rows)); @@ -982,7 +998,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } break; @@ -998,12 +1014,12 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { _("screen)")); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } break; default: - stellar_signingAbort(_("Stellar: invalid signer type")); + stellar_signingFail(_("Stellar: invalid signer type")); return false; } @@ -1017,7 +1033,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) { stellar_layoutTransactionDialog(_("Confirm Hash"), rows[0], rows[1], rows[2], rows[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } memzero(rows, sizeof(rows)); @@ -1042,7 +1058,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -1073,7 +1089,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) { // Validate destination account and convert to bytes uint8_t asset_issuer_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->asset.issuer, asset_issuer_bytes)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); fsm_sendFailure(FailureType_Failure_ProcessError, _("Invalid asset issuer")); return false; @@ -1085,7 +1101,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) { stellar_layoutTransactionDialog(str_title, str_amount_row, str_addr_rows[0], str_addr_rows[1], str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -1104,7 +1120,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -1126,7 +1142,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) { // Validate account and convert to bytes uint8_t trusted_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->trusted_account, trusted_account_bytes)) { - stellar_signingAbort(_("Invalid trusted account")); + stellar_signingFail(_("Invalid trusted account")); return false; } @@ -1141,7 +1157,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) { stellar_layoutTransactionDialog(str_title, str_asset_row, str_by, str_trustor_rows[1], str_trustor_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -1163,7 +1179,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) { stellar_hashupdate_bytes((uint8_t *)padded_code, 12); break; default: - stellar_signingAbort(_("Stellar: invalid asset type")); + stellar_signingFail(_("Stellar: invalid asset type")); return false; } // is authorized @@ -1179,7 +1195,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -1190,7 +1206,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) { uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; if (!stellar_getAddressBytes(msg->destination_account, destination_account_bytes)) { - stellar_signingAbort(_("Invalid destination account")); + stellar_signingFail(_("Invalid destination account")); return false; } @@ -1202,7 +1218,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) { str_destination_rows[0], str_destination_rows[1], str_destination_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -1219,7 +1235,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -1240,7 +1256,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) { stellar_layoutTransactionDialog(str_title, str_key_lines[0], str_key_lines[1], str_key_lines[2], str_key_lines[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -1258,7 +1274,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) { str_hash_lines[1], str_hash_lines[2], str_hash_lines[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } } @@ -1282,7 +1298,7 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) { if (!stellar_confirmSourceAccount(msg->has_source_account, msg->source_account)) { - stellar_signingAbort(_("Source account error")); + stellar_signingFail(_("Source account error")); return false; } @@ -1295,7 +1311,7 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) { stellar_layoutTransactionDialog(_("Bump Sequence"), _("Set sequence to:"), str_bump_to, NULL, NULL); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return false; } @@ -1307,16 +1323,6 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) { return true; } -void stellar_signingAbort(const char *reason) { - if (!reason) { - reason = _("Unknown error"); - } - - stellar_signing = false; - fsm_sendFailure(FailureType_Failure_ProcessError, reason); - layoutHome(); -} - /** * Populates the fields of resp with the signature of the active transaction */ @@ -1480,7 +1486,7 @@ void stellar_format_asset(const StellarAsset *asset, char *str_formatted, // Validate issuer account for non-native assets if (asset->type != StellarAssetType_NATIVE && !stellar_validateAddress(asset->issuer)) { - stellar_signingAbort(_("Invalid asset issuer")); + stellar_signingFail(_("Invalid asset issuer")); return; } @@ -1736,7 +1742,7 @@ void stellar_hashupdate_asset(const StellarAsset *asset) { uint8_t issuer_bytes[STELLAR_KEY_SIZE] = {0}; if (asset->type != StellarAssetType_NATIVE && !stellar_getAddressBytes(asset->issuer, issuer_bytes)) { - stellar_signingAbort(_("Invalid asset issuer")); + stellar_signingFail(_("Invalid asset issuer")); return; } @@ -1804,7 +1810,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) { str_addr_rows[0], str_addr_rows[1], str_addr_rows[2]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return; } @@ -1839,7 +1845,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) { strlcpy(str_lines[0], _("Memo (RETURN)"), sizeof(str_lines[0])); break; default: - stellar_signingAbort(_("Stellar invalid memo type")); + stellar_signingFail(_("Stellar invalid memo type")); return; } @@ -1853,7 +1859,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) { stellar_layoutTransactionDialog(str_lines[0], str_lines[1], str_lines[2], str_lines[3], str_lines[4]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return; } @@ -1891,7 +1897,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) { stellar_layoutTransactionDialog(_("Confirm Time Bounds"), str_lines[0], str_lines[1], str_lines[2], str_lines[3]); if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { - stellar_signingAbort(_("User canceled")); + stellar_signingFail(_("User canceled")); return; } } diff --git a/legacy/firmware/stellar.h b/legacy/firmware/stellar.h index 6e4163f87..f1aa5505e 100644 --- a/legacy/firmware/stellar.h +++ b/legacy/firmware/stellar.h @@ -54,7 +54,7 @@ typedef struct { // Signing process bool stellar_signingInit(const StellarSignTx *tx); -void stellar_signingAbort(const char *reason); +void stellar_signingAbort(void); bool stellar_confirmSourceAccount(bool has_source_account, const char *str_account); bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg);