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

signing: forgotten sig hash

Browse Source
This commit is contained in:
Tomas Susanka 2018-02-09 13:21:22 +01:00 committed by Jan Pochyla
parent 6bc0f82642
commit e6d693d18a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/apps/wallet/sign_tx/scripts.py
View File

@ -1,6 +1,4 @@
from apps.wallet.sign_tx.multisig import *
from apps.wallet.sign_tx.writers import *
from apps.common.hash_writer import HashWriter
from trezor.crypto.hashlib import sha256, ripemd160
@ -102,7 +100,7 @@ def input_script_p2wpkh_in_p2sh(pubkeyhash: bytes) -> bytearray:
# =============== Multisig ===============
def input_script_multisig(current_signature, other_signatures, pubkeys, m: int):
def input_script_multisig(current_signature, other_signatures, pubkeys, m: int, sighash: int):
w = bytearray()
# starts with OP_FALSE because of an old OP_CHECKMULTISIG bug,
# which consumes one additional item on the stack
@ -110,9 +108,9 @@ def input_script_multisig(current_signature, other_signatures, pubkeys, m: int):
w.append(0x00)
for s in other_signatures:
if len(s):
append_signature(w, s)
append_signature(w, s, sighash)
append_signature(w, current_signature)
append_signature(w, current_signature, sighash)
# redeem script
redeem_script = script_multisig(pubkeys, m)

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

@ -512,7 +512,8 @@ def input_derive_script(coin: CoinType, i: TxInputType, pubkey: bytes, signature
return input_script_native_p2wpkh_or_p2wsh()
# mutlisig
elif i.script_type == InputScriptType.SPENDMULTISIG:
return input_script_multisig(signature, i.multisig.signatures, multisig_get_pubkeys(i.multisig), i.multisig.m)
return input_script_multisig(signature, i.multisig.signatures, multisig_get_pubkeys(i.multisig), i.multisig.m,
get_hash_type(coin))
else:
raise SigningError(FailureType.ProcessError, 'Invalid script type')