arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

feat(legacy): Add fsm_abortWorkflows().

Browse Source
This commit is contained in:
Andrew Kozlik 2022-02-17 17:16:42 +01:00 committed by Martin Milata
parent e24e9fcdb3
commit 84876dc971
7 changed files with 90 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/firmware/.changelog.d/noissue.security.2 Normal file
View File

@ -0,0 +1 @@
Fix soft-lock bypass vulnerability.

5
legacy/firmware/config.c
View File

@ -431,7 +431,10 @@ void session_clearCache(Session *session) {
session->seedCached = false; 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) { static void get_u2froot_callback(uint32_t iter, uint32_t total) {
layoutProgress(_("Updating"), 1000 * iter / total); layoutProgress(_("Updating"), 1000 * iter / total);

9
legacy/firmware/fsm.c
View File

@ -376,6 +376,15 @@ void fsm_msgRebootToBootloader(void) {
#endif #endif
} }
void fsm_abortWorkflows(void) {
recovery_abort();
signing_abort();
#if !BITCOIN_ONLY
ethereum_signing_abort();
stellar_signingAbort();
#endif
}
bool fsm_layoutPathWarning(void) { bool fsm_layoutPathWarning(void) {
layoutDialogSwipe(&bmp_icon_warning, _("Abort"), _("Continue"), NULL, layoutDialogSwipe(&bmp_icon_warning, _("Abort"), _("Continue"), NULL,
_("Wrong address path"), _("for selected coin."), NULL, _("Wrong address path"), _("for selected coin."), NULL,

2
legacy/firmware/fsm.h
View File

@ -149,4 +149,6 @@ bool fsm_checkCoinPath(const CoinInfo *coin, InputScriptType script_type,
uint32_t address_n_count, const uint32_t *address_n, uint32_t address_n_count, const uint32_t *address_n,
bool has_multisig, bool show_warning); bool has_multisig, bool show_warning);
void fsm_abortWorkflows(void);
#endif #endif

9
legacy/firmware/fsm_msg_common.h
View File

@ -95,8 +95,7 @@ bool get_features(Features *resp) {
} }
void fsm_msgInitialize(const Initialize *msg) { void fsm_msgInitialize(const Initialize *msg) {
recovery_abort(); fsm_abortWorkflows();
signing_abort();
uint8_t *session_id; uint8_t *session_id;
if (msg && msg->has_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 fsm_msgCancel(const Cancel *msg) {
(void)msg; (void)msg;
recovery_abort(); fsm_abortWorkflows();
signing_abort();
#if !BITCOIN_ONLY
ethereum_signing_abort();
#endif
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL); fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
} }

136
legacy/firmware/stellar.c
View File

@ -155,6 +155,22 @@ bool stellar_signingInit(const StellarSignTx *msg) {
return true; 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, bool stellar_confirmSourceAccount(bool has_source_account,
const char *str_account) { const char *str_account) {
stellar_hashupdate_bool(has_source_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[0], str_addr_rows[1],
str_addr_rows[2]); str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -189,7 +205,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -199,7 +215,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) {
// Validate new account and convert to bytes // Validate new account and convert to bytes
uint8_t new_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t new_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->new_account, new_account_bytes)) { if (!stellar_getAddressBytes(msg->new_account, new_account_bytes)) {
stellar_signingAbort(_("Invalid new account address")); stellar_signingFail(_("Invalid new account address"));
return false; return false;
} }
@ -218,7 +234,7 @@ bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg) {
str_addr_rows[1], str_addr_rows[2], str_addr_rows[1], str_addr_rows[2],
str_amount_line); str_amount_line);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -236,7 +252,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -247,7 +263,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) {
uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->destination_account, if (!stellar_getAddressBytes(msg->destination_account,
destination_account_bytes)) { destination_account_bytes)) {
stellar_signingAbort(_("Invalid destination account")); stellar_signingFail(_("Invalid destination account"));
return false; return false;
} }
@ -273,7 +289,7 @@ bool stellar_confirmPaymentOp(const StellarPaymentOp *msg) {
stellar_layoutTransactionDialog(str_pay_amount, str_asset_row, str_to, stellar_layoutTransactionDialog(str_pay_amount, str_asset_row, str_to,
str_addr_rows[1], str_addr_rows[2]); str_addr_rows[1], str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -295,7 +311,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp(
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -306,7 +322,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp(
uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->destination_account, if (!stellar_getAddressBytes(msg->destination_account,
destination_account_bytes)) { destination_account_bytes)) {
stellar_signingAbort(_("Invalid destination account")); stellar_signingFail(_("Invalid destination account"));
return false; return false;
} }
const char **str_dest_rows = const char **str_dest_rows =
@ -343,7 +359,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp(
stellar_layoutTransactionDialog(str_pay_amount, str_dest_asset, str_to, stellar_layoutTransactionDialog(str_pay_amount, str_dest_asset, str_to,
str_dest_rows[1], str_dest_rows[2]); str_dest_rows[1], str_dest_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -360,7 +376,7 @@ bool stellar_confirmPathPaymentStrictReceiveOp(
_("This is the max"), _("This is the max"),
_("amount debited from your"), _("account.")); _("amount debited from your"), _("account."));
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
// Note: no confirmation for intermediate steps since they don't impact the // 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, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -405,7 +421,7 @@ bool stellar_confirmPathPaymentStrictSendOp(
uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->destination_account, if (!stellar_getAddressBytes(msg->destination_account,
destination_account_bytes)) { destination_account_bytes)) {
stellar_signingAbort(_("Invalid destination account")); stellar_signingFail(_("Invalid destination account"));
return false; return false;
} }
const char **str_dest_rows = const char **str_dest_rows =
@ -441,7 +457,7 @@ bool stellar_confirmPathPaymentStrictSendOp(
stellar_layoutTransactionDialog(_("Path Pay at least"), str_pay_amount, stellar_layoutTransactionDialog(_("Path Pay at least"), str_pay_amount,
str_dest_asset, str_to, str_dest_rows[1]); str_dest_asset, str_to, str_dest_rows[1]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -458,7 +474,7 @@ bool stellar_confirmPathPaymentStrictSendOp(
str_dest_rows[2], str_source_amount, str_send_asset, str_dest_rows[2], str_source_amount, str_send_asset,
_("This is the amount debited"), _("from your account.")); _("This is the amount debited"), _("from your account."));
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
// Note: no confirmation for intermediate steps since they don't impact the // 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, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -551,7 +567,7 @@ bool stellar_confirmManageBuyOfferOp(const StellarManageBuyOfferOp *msg) {
stellar_layoutTransactionDialog(str_offer, str_buying, str_buying_asset, stellar_layoutTransactionDialog(str_offer, str_buying, str_buying_asset,
str_selling, str_selling_asset); str_selling, str_selling_asset);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -578,7 +594,7 @@ bool stellar_confirmManageSellOfferOp(const StellarManageSellOfferOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -637,7 +653,7 @@ bool stellar_confirmManageSellOfferOp(const StellarManageSellOfferOp *msg) {
stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset, stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset,
str_buying, str_buying_asset); str_buying, str_buying_asset);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -665,7 +681,7 @@ bool stellar_confirmCreatePassiveSellOfferOp(
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -715,7 +731,7 @@ bool stellar_confirmCreatePassiveSellOfferOp(
stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset, stellar_layoutTransactionDialog(str_offer, str_selling, str_selling_asset,
str_buying, str_buying_asset); str_buying, str_buying_asset);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -740,7 +756,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -762,7 +778,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
uint8_t inflation_destination_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t inflation_destination_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->inflation_destination_account, if (!stellar_getAddressBytes(msg->inflation_destination_account,
inflation_destination_account_bytes)) { inflation_destination_account_bytes)) {
stellar_signingAbort(_("Invalid inflation destination account")); stellar_signingFail(_("Invalid inflation destination account"));
return false; return false;
} }
const char **str_addr_rows = const char **str_addr_rows =
@ -771,7 +787,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
stellar_layoutTransactionDialog(str_title, NULL, str_addr_rows[0], stellar_layoutTransactionDialog(str_title, NULL, str_addr_rows[0],
str_addr_rows[1], str_addr_rows[2]); str_addr_rows[1], str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -786,7 +802,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
// Auth required // Auth required
if (msg->clear_flags > 7) { if (msg->clear_flags > 7) {
stellar_signingAbort(_("Invalid flags")); stellar_signingFail(_("Invalid flags"));
return false; return false;
} }
if (msg->clear_flags & 0x01) { 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], stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2],
rows[3]); rows[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
memzero(rows, sizeof(rows)); memzero(rows, sizeof(rows));
@ -824,7 +840,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
// Auth required // Auth required
if (msg->set_flags > 7) { if (msg->set_flags > 7) {
stellar_signingAbort(_("Invalid flags")); stellar_signingFail(_("Invalid flags"));
return false; return false;
} }
if (msg->set_flags & 0x01) { 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], stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2],
rows[3]); rows[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
memzero(rows, sizeof(rows)); memzero(rows, sizeof(rows));
@ -919,7 +935,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2], stellar_layoutTransactionDialog(str_title, rows[0], rows[1], rows[2],
rows[3]); rows[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
memzero(rows, sizeof(rows)); memzero(rows, sizeof(rows));
@ -942,7 +958,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
stellar_layoutTransactionDialog(str_title, rows[0], rows[1], NULL, NULL); stellar_layoutTransactionDialog(str_title, rows[0], rows[1], NULL, NULL);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
memzero(rows, sizeof(rows)); memzero(rows, sizeof(rows));
@ -982,7 +998,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
str_addr_rows[2]); str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall,
false)) { false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
break; break;
@ -998,12 +1014,12 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
_("screen)")); _("screen)"));
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall,
false)) { false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
break; break;
default: default:
stellar_signingAbort(_("Stellar: invalid signer type")); stellar_signingFail(_("Stellar: invalid signer type"));
return false; return false;
} }
@ -1017,7 +1033,7 @@ bool stellar_confirmSetOptionsOp(const StellarSetOptionsOp *msg) {
stellar_layoutTransactionDialog(_("Confirm Hash"), rows[0], rows[1], stellar_layoutTransactionDialog(_("Confirm Hash"), rows[0], rows[1],
rows[2], rows[3]); rows[2], rows[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
memzero(rows, sizeof(rows)); memzero(rows, sizeof(rows));
@ -1042,7 +1058,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -1073,7 +1089,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) {
// Validate destination account and convert to bytes // Validate destination account and convert to bytes
uint8_t asset_issuer_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t asset_issuer_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->asset.issuer, asset_issuer_bytes)) { if (!stellar_getAddressBytes(msg->asset.issuer, asset_issuer_bytes)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
fsm_sendFailure(FailureType_Failure_ProcessError, fsm_sendFailure(FailureType_Failure_ProcessError,
_("Invalid asset issuer")); _("Invalid asset issuer"));
return false; return false;
@ -1085,7 +1101,7 @@ bool stellar_confirmChangeTrustOp(const StellarChangeTrustOp *msg) {
stellar_layoutTransactionDialog(str_title, str_amount_row, str_addr_rows[0], stellar_layoutTransactionDialog(str_title, str_amount_row, str_addr_rows[0],
str_addr_rows[1], str_addr_rows[2]); str_addr_rows[1], str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -1104,7 +1120,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -1126,7 +1142,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) {
// Validate account and convert to bytes // Validate account and convert to bytes
uint8_t trusted_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t trusted_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->trusted_account, trusted_account_bytes)) { if (!stellar_getAddressBytes(msg->trusted_account, trusted_account_bytes)) {
stellar_signingAbort(_("Invalid trusted account")); stellar_signingFail(_("Invalid trusted account"));
return false; return false;
} }
@ -1141,7 +1157,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) {
stellar_layoutTransactionDialog(str_title, str_asset_row, str_by, stellar_layoutTransactionDialog(str_title, str_asset_row, str_by,
str_trustor_rows[1], str_trustor_rows[2]); str_trustor_rows[1], str_trustor_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -1163,7 +1179,7 @@ bool stellar_confirmAllowTrustOp(const StellarAllowTrustOp *msg) {
stellar_hashupdate_bytes((uint8_t *)padded_code, 12); stellar_hashupdate_bytes((uint8_t *)padded_code, 12);
break; break;
default: default:
stellar_signingAbort(_("Stellar: invalid asset type")); stellar_signingFail(_("Stellar: invalid asset type"));
return false; return false;
} }
// is authorized // is authorized
@ -1179,7 +1195,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -1190,7 +1206,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) {
uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t destination_account_bytes[STELLAR_KEY_SIZE] = {0};
if (!stellar_getAddressBytes(msg->destination_account, if (!stellar_getAddressBytes(msg->destination_account,
destination_account_bytes)) { destination_account_bytes)) {
stellar_signingAbort(_("Invalid destination account")); stellar_signingFail(_("Invalid destination account"));
return false; return false;
} }
@ -1202,7 +1218,7 @@ bool stellar_confirmAccountMergeOp(const StellarAccountMergeOp *msg) {
str_destination_rows[0], str_destination_rows[1], str_destination_rows[0], str_destination_rows[1],
str_destination_rows[2]); str_destination_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -1219,7 +1235,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -1240,7 +1256,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) {
stellar_layoutTransactionDialog(str_title, str_key_lines[0], str_key_lines[1], stellar_layoutTransactionDialog(str_title, str_key_lines[0], str_key_lines[1],
str_key_lines[2], str_key_lines[3]); str_key_lines[2], str_key_lines[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -1258,7 +1274,7 @@ bool stellar_confirmManageDataOp(const StellarManageDataOp *msg) {
str_hash_lines[1], str_hash_lines[2], str_hash_lines[1], str_hash_lines[2],
str_hash_lines[3]); str_hash_lines[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
} }
@ -1282,7 +1298,7 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) {
if (!stellar_confirmSourceAccount(msg->has_source_account, if (!stellar_confirmSourceAccount(msg->has_source_account,
msg->source_account)) { msg->source_account)) {
stellar_signingAbort(_("Source account error")); stellar_signingFail(_("Source account error"));
return false; return false;
} }
@ -1295,7 +1311,7 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) {
stellar_layoutTransactionDialog(_("Bump Sequence"), _("Set sequence to:"), stellar_layoutTransactionDialog(_("Bump Sequence"), _("Set sequence to:"),
str_bump_to, NULL, NULL); str_bump_to, NULL, NULL);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return false; return false;
} }
@ -1307,16 +1323,6 @@ bool stellar_confirmBumpSequenceOp(const StellarBumpSequenceOp *msg) {
return true; 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 * 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 // Validate issuer account for non-native assets
if (asset->type != StellarAssetType_NATIVE && if (asset->type != StellarAssetType_NATIVE &&
!stellar_validateAddress(asset->issuer)) { !stellar_validateAddress(asset->issuer)) {
stellar_signingAbort(_("Invalid asset issuer")); stellar_signingFail(_("Invalid asset issuer"));
return; return;
} }
@ -1736,7 +1742,7 @@ void stellar_hashupdate_asset(const StellarAsset *asset) {
uint8_t issuer_bytes[STELLAR_KEY_SIZE] = {0}; uint8_t issuer_bytes[STELLAR_KEY_SIZE] = {0};
if (asset->type != StellarAssetType_NATIVE && if (asset->type != StellarAssetType_NATIVE &&
!stellar_getAddressBytes(asset->issuer, issuer_bytes)) { !stellar_getAddressBytes(asset->issuer, issuer_bytes)) {
stellar_signingAbort(_("Invalid asset issuer")); stellar_signingFail(_("Invalid asset issuer"));
return; return;
} }
@ -1804,7 +1810,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) {
str_addr_rows[0], str_addr_rows[1], str_addr_rows[0], str_addr_rows[1],
str_addr_rows[2]); str_addr_rows[2]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return; return;
} }
@ -1839,7 +1845,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) {
strlcpy(str_lines[0], _("Memo (RETURN)"), sizeof(str_lines[0])); strlcpy(str_lines[0], _("Memo (RETURN)"), sizeof(str_lines[0]));
break; break;
default: default:
stellar_signingAbort(_("Stellar invalid memo type")); stellar_signingFail(_("Stellar invalid memo type"));
return; return;
} }
@ -1853,7 +1859,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) {
stellar_layoutTransactionDialog(str_lines[0], str_lines[1], str_lines[2], stellar_layoutTransactionDialog(str_lines[0], str_lines[1], str_lines[2],
str_lines[3], str_lines[4]); str_lines[3], str_lines[4]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return; return;
} }
@ -1891,7 +1897,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg) {
stellar_layoutTransactionDialog(_("Confirm Time Bounds"), str_lines[0], stellar_layoutTransactionDialog(_("Confirm Time Bounds"), str_lines[0],
str_lines[1], str_lines[2], str_lines[3]); str_lines[1], str_lines[2], str_lines[3]);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
stellar_signingAbort(_("User canceled")); stellar_signingFail(_("User canceled"));
return; return;
} }
} }

2
legacy/firmware/stellar.h
View File

@ -54,7 +54,7 @@ typedef struct {
// Signing process // Signing process
bool stellar_signingInit(const StellarSignTx *tx); bool stellar_signingInit(const StellarSignTx *tx);
void stellar_signingAbort(const char *reason); void stellar_signingAbort(void);
bool stellar_confirmSourceAccount(bool has_source_account, bool stellar_confirmSourceAccount(bool has_source_account,
const char *str_account); const char *str_account);
bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg); bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg);