diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2012-10-20 10:56:04 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-10-20 10:56:04 -0700 |
| commit | dee0ee2ac9d6feb49eac9683c01a0eeed4389449 (patch) | |
| tree | 9eaf50e73a51a3b40da9cb557090a794138e9f35 /src/main.cpp | |
| parent | 485d667748b776a1932e3e14dc1b9dfe2ba841d0 (diff) | |
| parent | 58bc86e37fda1aec270bccb3df6c20fbd2a6591c (diff) | |
Merge pull request #1742 from sipa/canonical
Check for canonical public keys and signatures
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 28bf01a8cb..fb2e650ac4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -327,7 +327,7 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const // beside "push data" in the scriptSig the // IsStandard() call returns false vector<vector<unsigned char> > stack; - if (!EvalScript(stack, vin[i].scriptSig, *this, i, 0)) + if (!EvalScript(stack, vin[i].scriptSig, *this, i, false, 0)) return false; if (whichType == TX_SCRIPTHASH) @@ -1292,11 +1292,11 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs, if (!(fBlock && (nBestHeight < Checkpoints::GetTotalBlocksEstimate()))) { // Verify signature - if (!VerifySignature(txPrev, *this, i, fStrictPayToScriptHash, 0)) + if (!VerifySignature(txPrev, *this, i, fStrictPayToScriptHash, false, 0)) { // only during transition phase for P2SH: do not invoke anti-DoS code for // potentially old clients relaying bad P2SH transactions - if (fStrictPayToScriptHash && VerifySignature(txPrev, *this, i, false, 0)) + if (fStrictPayToScriptHash && VerifySignature(txPrev, *this, i, false, false, 0)) return error("ConnectInputs() : %s P2SH VerifySignature failed", GetHash().ToString().substr(0,10).c_str()); return DoS(100,error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str())); @@ -1350,7 +1350,7 @@ bool CTransaction::ClientConnectInputs() return false; // Verify signature - if (!VerifySignature(txPrev, *this, i, true, 0)) + if (!VerifySignature(txPrev, *this, i, true, false, 0)) return error("ConnectInputs() : VerifySignature failed"); ///// this is redundant with the mempool.mapNextTx stuff, |