arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-27 01:48:17 +00:00
Code Issues Releases Wiki Activity

Fix segwit multisig.

Browse Source 
Tested, see f41cbedd8becee05a830f418d13aa665125464547db5c7a6cd28f21639fe1228
and c9348040bbc2024e12dcb4a0b4806b0398646b91acf314da028c3f03dd0179fc
on testnet
This commit is contained in:
Jochen Hoenicke 2016-07-08 00:41:59 +02:00 committed by Pavol Rusnak
parent 895da908e0
commit 2950588271
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/signing.c
View File

@ -386,7 +386,8 @@ void signing_txack(TransactionType *tx)
case STAGE_REQUEST_1_INPUT: case STAGE_REQUEST_1_INPUT:
/* compute multisig fingerprint */ /* compute multisig fingerprint */
/* (if all input share the same fingerprint, outputs having the same fingerprint will be considered as change outputs) */ /* (if all input share the same fingerprint, outputs having the same fingerprint will be considered as change outputs) */
if (tx->inputs[0].has_multisig && !multisig_fp_mismatch) { if (tx->inputs[0].has_multisig && !multisig_fp_mismatch
&& tx->inputs[0].script_type == InputScriptType_SPENDMULTISIG) {
uint8_t h[32]; uint8_t h[32];
if (cryptoMultisigFingerprint(&(tx->inputs[0].multisig), h) == 0) { if (cryptoMultisigFingerprint(&(tx->inputs[0].multisig), h) == 0) {
fsm_sendFailure(FailureType_Failure_Other, "Error computing multisig fingerprint"); fsm_sendFailure(FailureType_Failure_Other, "Error computing multisig fingerprint");
@ -836,29 +837,35 @@ void signing_txack(TransactionType *tx)
resp.serialized.has_serialized_tx = true; resp.serialized.has_serialized_tx = true;
ecdsa_sign_digest(&secp256k1, node.private_key, hash, sig, 0); ecdsa_sign_digest(&secp256k1, node.private_key, hash, sig, 0);
resp.serialized.signature.size = ecdsa_sig_to_der(sig, resp.serialized.signature.bytes); resp.serialized.signature.size = ecdsa_sig_to_der(sig, resp.serialized.signature.bytes);
if (input.has_multisig) { if (tx->inputs[0].has_multisig) {
uint32_t r, i, script_len; uint32_t r, i, script_len;
int nwitnesses;
// fill in the signature // fill in the signature
int pubkey_idx = cryptoMultisigPubkeyIndex(&(input.multisig), node.public_key); int pubkey_idx = cryptoMultisigPubkeyIndex(&(tx->inputs[0].multisig), node.public_key);
if (pubkey_idx < 0) { if (pubkey_idx < 0) {
fsm_sendFailure(FailureType_Failure_Other, "Pubkey not found in multisig script"); fsm_sendFailure(FailureType_Failure_Other, "Pubkey not found in multisig script");
signing_abort(); signing_abort();
return; return;
} }
memcpy(input.multisig.signatures[pubkey_idx].bytes, resp.serialized.signature.bytes, resp.serialized.signature.size); memcpy(tx->inputs[0].multisig.signatures[pubkey_idx].bytes, resp.serialized.signature.bytes, resp.serialized.signature.size);
input.multisig.signatures[pubkey_idx].size = resp.serialized.signature.size; tx->inputs[0].multisig.signatures[pubkey_idx].size = resp.serialized.signature.size;
r = 0;
r += ser_length(input.multisig.signatures_count + 2, resp.serialized.serialized_tx.bytes + r); r = 1; // skip number of items (filled in later)
resp.serialized.serialized_tx.bytes[r] = 0; r++; resp.serialized.serialized_tx.bytes[r] = 0; r++;
for (i = 0; i < input.multisig.signatures_count; i++) { nwitnesses = 2;
input.multisig.signatures[i].bytes[input.multisig.signatures[i].size] = 1; for (i = 0; i < tx->inputs[0].multisig.signatures_count; i++) {
r += tx_serialize_script(input.multisig.signatures[i].size + 1, input.multisig.signatures[i].bytes, resp.serialized.serialized_tx.bytes + r); if (tx->inputs[0].multisig.signatures[i].size == 0) {
continue;
}
nwitnesses++;
tx->inputs[0].multisig.signatures[i].bytes[tx->inputs[0].multisig.signatures[i].size] = 1;
r += tx_serialize_script(tx->inputs[0].multisig.signatures[i].size + 1, tx->inputs[0].multisig.signatures[i].bytes, resp.serialized.serialized_tx.bytes + r);
} }
script_len = compile_script_multisig(&input.multisig, 0); script_len = compile_script_multisig(&tx->inputs[0].multisig, 0);
r += ser_length(script_len, resp.serialized.serialized_tx.bytes + r); r += ser_length(script_len, resp.serialized.serialized_tx.bytes + r);
r += compile_script_multisig(&input.multisig, resp.serialized.serialized_tx.bytes + r); r += compile_script_multisig(&tx->inputs[0].multisig, resp.serialized.serialized_tx.bytes + r);
r += tx_serialize_script(resp.serialized.signature.size, resp.serialized.signature.bytes, resp.serialized.serialized_tx.bytes + r); resp.serialized.serialized_tx.bytes[0] = nwitnesses;
resp.serialized.serialized_tx.size = r; resp.serialized.serialized_tx.size = r;
} else { // single signature } else { // single signature
uint32_t r = 0; uint32_t r = 0;