Merge pull request #1742 from sipa/canonical

Check for canonical public keys and signatures
2012-10-20 10:56:04 -07:00
parent 485d667748 58bc86e37f
commit dee0ee2ac9
12 changed files with 245 additions and 62 deletions
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -469,7 +469,7 @@ Value signrawtransaction(const Array& params, bool fHelp)
        {
            txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig);
        }
-        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx, i, true, 0))
+        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx, i, true, true, 0))
            fComplete = false;
    }