diff options
| author | Pieter Wuille <[email protected]> | 2012-10-29 03:28:49 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-10-29 03:28:49 -0700 |
| commit | c13f5dbecf2bc22e81ad847f0cf4b1bf632cdd8d (patch) | |
| tree | 279582e151108a5132278cf4f37b8644c482a58d /src/main.cpp | |
| parent | First flush block tree, then coin set (diff) | |
| parent | Remove P2SH transition code: P2SH violations may cause DoS trigger (diff) | |
| download | discoin-c13f5dbecf2bc22e81ad847f0cf4b1bf632cdd8d.tar.xz discoin-c13f5dbecf2bc22e81ad847f0cf4b1bf632cdd8d.zip | |
Merge pull request #1710 from sipa/dosp2sh
Remove P2SH transition code: P2SH violations may cause DoS trigger
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index b1fdc2ed5..43bd5dd47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1382,14 +1382,8 @@ bool CTransaction::CheckInputs(CCoinsViewCache &inputs, enum CheckSig_mode csmod const CCoins &coins = inputs.GetCoins(prevout.hash); // Verify signature - if (!VerifySignature(coins, *this, i, fStrictPayToScriptHash, fStrictEncodings, 0)) { - // only during transition phase for P2SH: do not invoke anti-DoS code for - // potentially old clients relaying bad P2SH transactions - if (fStrictPayToScriptHash && VerifySignature(coins, *this, i, false, fStrictEncodings, 0)) - return error("CheckInputs() : %s P2SH VerifySignature failed", GetHash().ToString().substr(0,10).c_str()); - + if (!VerifySignature(coins, *this, i, fStrictPayToScriptHash, fStrictEncodings, 0)) return DoS(100,error("CheckInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str())); - } } } } |