aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGregory Maxwell <[email protected]>2014-02-11 12:44:42 -0800
committerGregory Maxwell <[email protected]>2014-02-11 12:44:42 -0800
commit2bc52f1c4a7d66661ed26e100a914e68df6d2bcc (patch)
tree193f73d99ddbd70a67b5aafdcf353174f2cf4a96 /src/main.cpp
parentMerge pull request #3622 (diff)
parentAdd HasCanonicalPushes(), and use it in IsStandardTx (diff)
downloaddiscoin-2bc52f1c4a7d66661ed26e100a914e68df6d2bcc.tar.xz
discoin-2bc52f1c4a7d66661ed26e100a914e68df6d2bcc.zip
Merge pull request #3025 from sipa/noncanpush
Make signatures with non-canonical data pushes non-standard.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index d33ad2fa9..1df9a24d5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -442,6 +442,10 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
reason = "scriptsig-not-pushonly";
return false;
}
+ if (!txin.scriptSig.HasCanonicalPushes()) {
+ reason = "non-canonical-push";
+ return false;
+ }
}
unsigned int nDataOut = 0;