diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-01-19 18:37:21 -0500 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-02-01 17:57:38 -0400 |
commit | 773c30d7564882d347ec80c77992a61935f6675a (patch) | |
tree | eac9f501a25520de08e216b43fe693813873f6f6 /src/script | |
parent | 18695f08ef1150851b3ff86cdf7bd5870f65e1dd (diff) | |
download | bitcoin-773c30d7564882d347ec80c77992a61935f6675a.tar.xz |
BIP66 changeover logic
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/bitcoinconsensus.h | 1 | ||||
-rw-r--r-- | src/script/standard.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 15e3337a8d..c57d8b3cc5 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -46,6 +46,7 @@ enum { bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE = 0, bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH = (1U << 0), // evaluate P2SH (BIP16) subscripts + bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG = (1U << 2), // enforce strict DER (BIP66) compliance }; /// Returns 1 if the input nIn of the serialized transaction pointed to by diff --git a/src/script/standard.h b/src/script/standard.h index c4b82b4c45..3fea6b9ab9 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -45,6 +45,7 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH; * blocks and we must accept those blocks. */ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS | + SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_MINIMALDATA | SCRIPT_VERIFY_NULLDUMMY | |