diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:14:36 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:21:56 +0100 |
| commit | ca6fb4e885c899e297e0a6fa723604a41f199aa6 (patch) | |
| tree | 8440a612e083244a40bf0ba200cefa261ff762f6 /src/script/interpreter.h | |
| parent | cb83af9937138ac7daa692202e4578f117a0fefb (diff) | |
| parent | ca8158719b17ebdcf1de1e26079b6b896122d0e5 (diff) | |
| download | bitcoin-ca6fb4e885c899e297e0a6fa723604a41f199aa6.tar.xz | |
Merge pull request #5247
ca81587 Test the exact order of CHECKMULTISIG sig/pubkey evaluation (Peter Todd)
98b135f Make STRICTENC invalid pubkeys fail the script rather than the opcode. (Pieter Wuille)
Diffstat (limited to 'src/script/interpreter.h')
| -rw-r--r-- | src/script/interpreter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 12b2719414..35b2f6c65a 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -35,8 +35,8 @@ enum SCRIPT_VERIFY_P2SH = (1U << 0), // Passing a non-strict-DER signature or one with undefined hashtype to a checksig operation causes script failure. - // Passing a pubkey that is not (0x04 + 64 bytes) or (0x02 or 0x03 + 32 bytes) to checksig causes that pubkey to be - // skipped (not softfork safe: this flag can widen the validity of OP_CHECKSIG OP_NOT). + // Evaluating a pubkey that is not (0x04 + 64 bytes) or (0x02 or 0x03 + 32 bytes) by checksig causes script failure. + // (softfork safe, but not used or intended as a consensus rule). SCRIPT_VERIFY_STRICTENC = (1U << 1), // Passing a non-strict-DER signature to a checksig operation causes script failure (softfork safe, BIP62 rule 1) |