diff options
| author | jtimon <jtimon@monetize.io> | 2014-07-18 18:47:10 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-12 20:04:31 +0200 |
| commit | 6dcfda2dc48bee2148acd571dce7d3f09608d7a2 (patch) | |
| tree | 6ba3fec3363d4843eee8887c7a51112385fffec0 /src/script/sign.cpp | |
| parent | 2b23a87599b7d28e86ca193e7b52f429bcdf144f (diff) | |
| download | bitcoin-6dcfda2dc48bee2148acd571dce7d3f09608d7a2.tar.xz | |
Don't pass nHashType to EvalScript nor CheckSig
Diffstat (limited to 'src/script/sign.cpp')
| -rw-r--r-- | src/script/sign.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 7037193b9c..cbddc1b72a 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -174,7 +174,7 @@ static CScript CombineMultisig(CScript scriptPubKey, const CMutableTransaction& if (sigs.count(pubkey)) continue; // Already got a sig for this pubkey - if (CheckSig(sig, pubkey, scriptPubKey, txTo, nIn, 0, 0)) + if (CheckSig(sig, pubkey, scriptPubKey, txTo, nIn, 0)) { sigs[pubkey] = sig; break; @@ -252,9 +252,9 @@ CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsign Solver(scriptPubKey, txType, vSolutions); vector<valtype> stack1; - EvalScript(stack1, scriptSig1, CTransaction(), 0, SCRIPT_VERIFY_STRICTENC, 0); + EvalScript(stack1, scriptSig1, CTransaction(), 0, SCRIPT_VERIFY_STRICTENC); vector<valtype> stack2; - EvalScript(stack2, scriptSig2, CTransaction(), 0, SCRIPT_VERIFY_STRICTENC, 0); + EvalScript(stack2, scriptSig2, CTransaction(), 0, SCRIPT_VERIFY_STRICTENC); return CombineSignatures(scriptPubKey, txTo, nIn, txType, vSolutions, stack1, stack2); } |