arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-11 16:00:57 +00:00
Code Issues Releases Wiki Activity

legacy: Drop obsolete check for ANYONECANSPEND segwit outputs.

Browse Source
This commit is contained in:
Andrew Kozlik 2020-03-19 17:28:50 +01:00 committed by Tomas Susanka
parent f786d75a6f
commit 175d708ebc
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/firmware/signing.c
View File

@ -68,7 +68,7 @@ static uint8_t hash_prevouts[32], hash_sequence[32], hash_outputs[32];
static uint8_t decred_hash_prefix[32]; static uint8_t decred_hash_prefix[32];
#endif #endif
static uint8_t hash_check[32]; static uint8_t hash_check[32];
static uint64_t to_spend, authorized_amount, spending, change_spend; static uint64_t to_spend, authorized_bip143_in, spending, change_spend;
static uint32_t version = 1; static uint32_t version = 1;
static uint32_t lock_time = 0; static uint32_t lock_time = 0;
static uint32_t expiry = 0; static uint32_t expiry = 0;
@ -529,7 +529,7 @@ void signing_init(const SignTx *msg, const CoinInfo *_coin,
to_spend = 0; to_spend = 0;
spending = 0; spending = 0;
change_spend = 0; change_spend = 0;
authorized_amount = 0; authorized_bip143_in = 0;
memzero(&input, sizeof(TxInputType)); memzero(&input, sizeof(TxInputType));
memzero(&resp, sizeof(TxRequest)); memzero(&resp, sizeof(TxRequest));
@ -633,14 +633,6 @@ static bool is_segwit_input_script_type(const TxInputType *txinput) {
return false; return false;
} }
static bool is_segwit_output_script_type(const TxOutputType *txoutput) {
if (txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS ||
txoutput->script_type == OutputScriptType_PAYTOWITNESS) {
return true;
}
return false;
}
static bool signing_validate_input(const TxInputType *txinput) { static bool signing_validate_input(const TxInputType *txinput) {
if (txinput->prev_hash.size != 32) { if (txinput->prev_hash.size != 32) {
fsm_sendFailure(FailureType_Failure_ProcessError, fsm_sendFailure(FailureType_Failure_ProcessError,
@ -851,16 +843,6 @@ static bool signing_check_output(TxOutputType *txoutput) {
} else { } else {
is_change = check_change_bip32_path(txoutput); is_change = check_change_bip32_path(txoutput);
} }
/*
* only allow segwit change if amount is smaller than what segwit inputs
* paid. this was added during the times segwit was not yet fully activated
* to make sure the user is not tricked to use witness change output
* instead of regular one therefore creating ANYONECANSPEND output
*/
if ((is_segwit_output_script_type(txoutput)) &&
txoutput->amount > authorized_amount) {
is_change = false;
}
} }
if (!is_change_output_script_type(txoutput)) { if (!is_change_output_script_type(txoutput)) {
@ -1176,13 +1158,13 @@ static bool signing_sign_segwit_input(TxInputType *txinput) {
signing_abort(); signing_abort();
return false; return false;
} }
if (txinput->amount > authorized_amount) { if (txinput->amount > authorized_bip143_in) {
fsm_sendFailure(FailureType_Failure_DataError, fsm_sendFailure(FailureType_Failure_DataError,
_("Transaction has changed during signing")); _("Transaction has changed during signing"));
signing_abort(); signing_abort();
return false; return false;
} }
authorized_amount -= txinput->amount; authorized_bip143_in -= txinput->amount;
signing_hash_bip143(txinput, hash); signing_hash_bip143(txinput, hash);
@ -1313,7 +1295,7 @@ void signing_txack(TransactionType *tx) {
return; return;
} }
to_spend += tx->inputs[0].amount; to_spend += tx->inputs[0].amount;
authorized_amount += tx->inputs[0].amount; authorized_bip143_in += tx->inputs[0].amount;
phase1_request_next_input(); phase1_request_next_input();
} else } else
#endif #endif
@ -1347,7 +1329,7 @@ void signing_txack(TransactionType *tx) {
to.is_segwit = true; to.is_segwit = true;
#endif #endif
to_spend += tx->inputs[0].amount; to_spend += tx->inputs[0].amount;
authorized_amount += tx->inputs[0].amount; authorized_bip143_in += tx->inputs[0].amount;
phase1_request_next_input(); phase1_request_next_input();
} else { } else {
fsm_sendFailure(FailureType_Failure_DataError, fsm_sendFailure(FailureType_Failure_DataError,
@ -1628,13 +1610,13 @@ void signing_txack(TransactionType *tx) {
signing_abort(); signing_abort();
return; return;
} }
if (tx->inputs[0].amount > authorized_amount) { if (tx->inputs[0].amount > authorized_bip143_in) {
fsm_sendFailure(FailureType_Failure_DataError, fsm_sendFailure(FailureType_Failure_DataError,
_("Transaction has changed during signing")); _("Transaction has changed during signing"));
signing_abort(); signing_abort();
return; return;
} }
authorized_amount -= tx->inputs[0].amount; authorized_bip143_in -= tx->inputs[0].amount;
uint8_t hash[32] = {0}; uint8_t hash[32] = {0};
#if !BITCOIN_ONLY #if !BITCOIN_ONLY