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

signing: add option to enable/disable mixing of segwit/non-segwit inputs

Browse Source
This commit is contained in:
Pavol Rusnak 2017-05-09 23:26:18 +02:00
parent 261b8d5e41
commit 1ecbca8338
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/signing.c
View File

@ -748,6 +748,8 @@ static bool signing_sign_segwit_input(TxInputType *txinput) {
return true; return true;
} }
#define ENABLE_SEGWIT_NONSEGWIT_MIXING 0
void signing_txack(TransactionType *tx) void signing_txack(TransactionType *tx)
{ {
if (!signing) { if (!signing) {
@ -774,6 +776,14 @@ void signing_txack(TransactionType *tx)
if (next_nonsegwit_input == 0xffffffff) if (next_nonsegwit_input == 0xffffffff)
next_nonsegwit_input = idx1; next_nonsegwit_input = idx1;
memcpy(&input, tx->inputs, sizeof(TxInputType)); memcpy(&input, tx->inputs, sizeof(TxInputType));
#if !ENABLE_SEGWIT_NONSEGWIT_MIXING
// don't mix segwit and non-segwit inputs
if (idx1 > 0 && to.is_segwit == true) {
fsm_sendFailure(FailureType_Failure_Other, "Mixing segwit and non-segwit inputs is not allowed");
signing_abort();
return;
}
#endif
send_req_2_prev_meta(); send_req_2_prev_meta();
} else if (tx->inputs[0].script_type == InputScriptType_SPENDWITNESS } else if (tx->inputs[0].script_type == InputScriptType_SPENDWITNESS
|| tx->inputs[0].script_type == InputScriptType_SPENDP2SHWITNESS) { || tx->inputs[0].script_type == InputScriptType_SPENDP2SHWITNESS) {
@ -792,9 +802,20 @@ void signing_txack(TransactionType *tx)
signing_abort(); signing_abort();
return; return;
} }
#if !ENABLE_SEGWIT_NONSEGWIT_MIXING
// don't mix segwit and non-segwit inputs
if (idx1 == 0) {
to.is_segwit = true;
} else if (to.is_segwit == false) {
fsm_sendFailure(FailureType_Failure_Other, "Mixing segwit and non-segwit inputs is not allowed");
signing_abort();
return;
}
#else
to.is_segwit = true;
#endif
to_spend += tx->inputs[0].amount; to_spend += tx->inputs[0].amount;
segwit_to_spend += tx->inputs[0].amount; segwit_to_spend += tx->inputs[0].amount;
to.is_segwit = true;
phase1_request_next_input(); phase1_request_next_input();
} else { } else {
fsm_sendFailure(FailureType_Failure_Other, "Wrong input script type"); fsm_sendFailure(FailureType_Failure_Other, "Wrong input script type");