From 60f89779a3586f8afae47bb8e9c374cd5fe7f8b6 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sat, 25 Feb 2012 19:02:30 +0100 Subject: [PATCH] Do not invoke anti-DoS system for invalid BIP16 transactions Doing so would allow an attack on old nodes, which would relay a standard transaction spending a BIP16 output in an invalid way, until reaching a new node, which will disconnect their peer. Reported by makomk on IRC. --- src/main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 5c1b138dc3c..4316d242f9f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1028,7 +1028,15 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs, // Verify signature if (!VerifySignature(txPrev, *this, i, fStrictPayToScriptHash, 0)) + { + // only during transition phase for P2SH: do not invoke (external) + // anti-DoS code for potentially old clients relaying bad P2SH + // transactions + if (fStrictPayToScriptHash && VerifySignature(txPrev, *this, i, false, 0)) + return error("ConnectInputs() : %s P2SH VerifySignature failed", GetHash().ToString().substr(0,10).c_str()); + return error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str()); + } // Mark outpoints as spent txindex.vSpent[prevout.n] = posThisTx;