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

signing/multisig: check if pubkey is part of multisig msg

Browse Source
This commit is contained in:
Tomas Susanka 2018-01-31 12:48:18 +01:00 committed by Jan Pochyla
parent 2c2f2ff97b
commit 8715e20b79
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apps/wallet/sign_tx/multisig.py
View File

@ -6,6 +6,13 @@ from trezor.messages.HDNodePathType import HDNodePathType
from apps.wallet.sign_tx.writers import * from apps.wallet.sign_tx.writers import *
def multisig_pubkey_index(multisig: MultisigRedeemScriptType, pubkey: bytes) -> int:
for i, hd in enumerate(multisig.pubkeys):
if multisig_get_pubkey(hd) == pubkey:
return i
return -1
def multisig_get_pubkey(hd: HDNodePathType) -> bytes: def multisig_get_pubkey(hd: HDNodePathType) -> bytes:
p = hd.address_n p = hd.address_n
n = hd.node n = hd.node

12
src/apps/wallet/sign_tx/signing.py
View File

@ -238,9 +238,10 @@ async def sign_tx(tx: SignTx, root):
key_sign = node_derive(root, txi.address_n) key_sign = node_derive(root, txi.address_n)
key_sign_pub = key_sign.public_key() key_sign_pub = key_sign.public_key()
# for the signing process the script_sig is equal # for the signing process the script_sig is equal
# to the scriptPubKey (P2PKH) or a redeem script (P2SH) # to the previous tx's scriptPubKey (P2PKH) or a redeem script (P2SH)
if txi_sign.script_type == InputScriptType.SPENDMULTISIG: if txi_sign.script_type == InputScriptType.SPENDMULTISIG:
txi_sign.script_sig = script_multisig(multisig_get_pubkeys(txi_sign.multisig), txi_sign.multisig.m) txi_sign.script_sig = script_multisig(multisig_get_pubkeys(txi_sign.multisig),
txi_sign.multisig.m)
elif txi_sign.script_type == InputScriptType.SPENDADDRESS: elif txi_sign.script_type == InputScriptType.SPENDADDRESS:
txi_sign.script_sig = output_script_p2pkh( txi_sign.script_sig = output_script_p2pkh(
ecdsa_hash_pubkey(key_sign_pub)) ecdsa_hash_pubkey(key_sign_pub))
@ -270,6 +271,13 @@ async def sign_tx(tx: SignTx, root):
raise SigningError(FailureType.ProcessError, raise SigningError(FailureType.ProcessError,
'Transaction has changed during signing') 'Transaction has changed during signing')
# if multisig, check if singing with a key that is included in multisig
if txi_sign.multisig:
pubkey_idx = multisig_pubkey_index(txi_sign.multisig, key_sign_pub)
if pubkey_idx < 0:
raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
# compute the signature from the tx digest # compute the signature from the tx digest
signature = ecdsa_sign(key_sign, get_tx_hash(h_sign, True)) signature = ecdsa_sign(key_sign, get_tx_hash(h_sign, True))
tx_ser.signature_index = i_sign tx_ser.signature_index = i_sign