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

feat(legacy): Ensure input's script type and path match the scriptPubKey.

Browse Source
This commit is contained in:
Andrew Kozlik 2022-01-12 19:48:10 +01:00 committed by Andrew Kozlik
parent c9e6ca30c9
commit 8cb6d0709f
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/firmware/.changelog.d/1018.changed Normal file
View File

@ -0,0 +1 @@
Ensure input's script type and path match the scriptPubKey.

1
legacy/firmware/.changelog.d/1018.incompatible Normal file
View File

@ -0,0 +1 @@
Trezor will refuse to sign UTXOs that do not match the provided derivation path (e.g., transactions belonging to a different wallet, or synthetic transaction inputs).

16
legacy/firmware/signing.c
View File

@ -2527,6 +2527,13 @@ void signing_txack(TransactionType *tx) {
memcpy(&input, tx->inputs, sizeof(TxInputType));
if (!fill_input_script_pubkey(coin, &root, &input)) {
fsm_sendFailure(FailureType_Failure_ProcessError,
_("Failed to derive scriptPubKey"));
signing_abort();
return;
}
send_req_3_prev_meta();
return;
case STAGE_REQUEST_3_PREV_META:
@ -2651,6 +2658,15 @@ void signing_txack(TransactionType *tx) {
signing_abort();
return;
}
if (input.script_pubkey.size != tx->bin_outputs[0].script_pubkey.size ||
memcmp(input.script_pubkey.bytes,
tx->bin_outputs[0].script_pubkey.bytes,
input.script_pubkey.size) != 0) {
fsm_sendFailure(FailureType_Failure_DataError,
_("Input does not match scriptPubKey"));
signing_abort();
return;
}
#if !BITCOIN_ONLY
if (coin->decred && tx->bin_outputs[0].decred_script_version > 0) {
fsm_sendFailure(FailureType_Failure_DataError,