arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-22 12:32:02 +00:00
Code Issues Releases Wiki Activity

Less paranoid change outputs.

Browse Source 
- Allow change to be on the main chain (see spesmilo/electrum#3920).
- Allow more than one output to the Trezor, but don't treat it as change.
This commit is contained in:
Jochen Hoenicke 2018-02-20 15:27:24 +01:00 committed by Pavol Rusnak
parent 9b09375713
commit 1bc1bb1e77
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/signing.c
View File

@ -389,7 +389,7 @@ bool check_change_bip32_path(const TxOutputType *toutput)
&& count == in_address_n_count
&& 0 == memcmp(in_address_n, toutput->address_n,
(count - BIP32_WALLET_DEPTH) * sizeof(uint32_t))
&& toutput->address_n[count - 2] == BIP32_CHANGE_CHAIN
&& toutput->address_n[count - 2] <= BIP32_CHANGE_CHAIN
&& toutput->address_n[count - 1] <= BIP32_MAX_LAST_ELEMENT);
}
@ -565,9 +565,8 @@ static bool signing_check_output(TxOutputType *txoutput) {
if (change_spend == 0) { // not set
change_spend = txoutput->amount;
} else {
fsm_sendFailure(FailureType_Failure_DataError, _("Only one change output allowed"));
signing_abort();
return false;
/* We only skip confirmation for the first change output */
is_change = false;
}
}