d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix blind-signing TX refusal

Browse Source 
Would refuse the APDU but then start a empty signature flow on the device
Which would crash the device when accepted or rejected
This commit is contained in:
Alexandre Paillier
2024-03-08 14:36:10 +01:00
parent a76940b2fd
commit 72e26947c3
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src_features/signTx/logic_signTx.c
View File

@@ -316,15 +316,13 @@ static int strcasecmp_workaround(const char *str1, const char *str2) {
return 0; return 0;
} }
__attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool *use_standard_UI) { __attribute__((noinline)) static bool finalize_parsing_helper(bool direct, bool *use_standard_UI) {
char displayBuffer[50]; char displayBuffer[50];
uint8_t decimals = WEI_TO_ETHER; uint8_t decimals = WEI_TO_ETHER;
uint64_t chain_id = get_tx_chain_id(); uint64_t chain_id = get_tx_chain_id();
const char *ticker = get_displayable_ticker(&chain_id, chainConfig); const char *ticker = get_displayable_ticker(&chain_id, chainConfig);
ethPluginFinalize_t pluginFinalize; ethPluginFinalize_t pluginFinalize;
*use_standard_UI = true;
// Verify the chain // Verify the chain
if (chainConfig->chainId != ETHEREUM_MAINNET_CHAINID) { if (chainConfig->chainId != ETHEREUM_MAINNET_CHAINID) {
uint64_t id = get_tx_chain_id(); uint64_t id = get_tx_chain_id();
@@ -334,7 +332,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
reset_app_context(); reset_app_context();
reportFinalizeError(direct); reportFinalizeError(direct);
if (!direct) { if (!direct) {
return; return false;
} }
} }
} }
@@ -358,7 +356,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
PRINTF("Plugin finalize call failed\n"); PRINTF("Plugin finalize call failed\n");
reportFinalizeError(direct); reportFinalizeError(direct);
if (!direct) { if (!direct) {
return; return false;
} }
} }
// Lookup tokens if requested // Lookup tokens if requested
@@ -384,7 +382,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
PRINTF("Plugin provide token call failed\n"); PRINTF("Plugin provide token call failed\n");
reportFinalizeError(direct); reportFinalizeError(direct);
if (!direct) { if (!direct) {
return; return false;
} }
} }
pluginFinalize.result = pluginProvideInfo.result; pluginFinalize.result = pluginProvideInfo.result;
@@ -409,7 +407,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
PRINTF("Incorrect amount/address set by plugin\n"); PRINTF("Incorrect amount/address set by plugin\n");
reportFinalizeError(direct); reportFinalizeError(direct);
if (!direct) { if (!direct) {
return; return false;
} }
} }
memmove(tmpContent.txContent.value.value, pluginFinalize.amount, 32); memmove(tmpContent.txContent.value.value, pluginFinalize.amount, 32);
@@ -425,7 +423,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
PRINTF("ui type %d not supported\n", pluginFinalize.uiType); PRINTF("ui type %d not supported\n", pluginFinalize.uiType);
reportFinalizeError(direct); reportFinalizeError(direct);
if (!direct) { if (!direct) {
return; return false;
} }
} }
} }
@@ -450,7 +448,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
reportFinalizeError(direct); reportFinalizeError(direct);
ui_warning_contract_data(); ui_warning_contract_data();
if (!direct) { if (!direct) {
return; return false;
} }
} }
@@ -530,12 +528,16 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
// Prepare network field // Prepare network field
get_network_as_string(strings.common.network_name, sizeof(strings.common.network_name)); get_network_as_string(strings.common.network_name, sizeof(strings.common.network_name));
PRINTF("Network: %s\n", strings.common.network_name); PRINTF("Network: %s\n", strings.common.network_name);
return true;
} }
void finalizeParsing(bool direct) { void finalizeParsing(bool direct) {
bool use_standard_UI; bool use_standard_UI = true;
bool no_consent_check; bool no_consent_check;
finalize_parsing_helper(direct, &use_standard_UI);
if (!finalize_parsing_helper(direct, &use_standard_UI)) {
return;
}
// If called from swap, the user has already validated a standard transaction // If called from swap, the user has already validated a standard transaction
// And we have already checked the fields of this transaction above // And we have already checked the fields of this transaction above
no_consent_check = G_called_from_swap && use_standard_UI; no_consent_check = G_called_from_swap && use_standard_UI;