arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-05 13:26:57 +00:00
Code Issues Releases Wiki Activity

multisig: allow mismatched change addresses, show them as non-change

Browse Source
This commit is contained in:
Pavol Rusnak 2017-05-06 19:52:49 +02:00
parent 4343d0eaeb
commit 261b8d5e41
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/signing.c
View File

@ -510,14 +510,11 @@ static bool signing_check_output(TxOutputType *txoutput) {
} }
if (txoutput->script_type == OutputScriptType_PAYTOMULTISIG) { if (txoutput->script_type == OutputScriptType_PAYTOMULTISIG) {
uint8_t h[32]; uint8_t h[32];
if (!multisig_fp_set || multisig_fp_mismatch if (multisig_fp_set && !multisig_fp_mismatch
|| cryptoMultisigFingerprint(&(txoutput->multisig), h) == 0 && cryptoMultisigFingerprint(&(txoutput->multisig), h)
|| memcmp(multisig_fp, h, 32) != 0) { && memcmp(multisig_fp, h, 32) == 0) {
fsm_sendFailure(FailureType_Failure_Other, "Invalid multisig change address"); is_change = check_change_bip32_path(txoutput);
signing_abort();
return false;
} }
is_change = check_change_bip32_path(txoutput);
} else if (txoutput->script_type == OutputScriptType_PAYTOADDRESS } else if (txoutput->script_type == OutputScriptType_PAYTOADDRESS
|| ((txoutput->script_type == OutputScriptType_PAYTOWITNESS || ((txoutput->script_type == OutputScriptType_PAYTOWITNESS
|| txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS) || txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS)