aboutsummaryrefslogtreecommitdiff
path: root/src/script/interpreter.h
diff options
context:
space:
mode:
authorJohnson Lau <jl2012@xbt.hk>2016-10-02 01:19:33 +0800
committerWladimir J. van der Laan <laanwj@gmail.com>2016-10-17 14:10:58 +0200
commit821f3e67510b9ea0b5c7b79d162daf5f0f075462 (patch)
tree2bf532aa805200ed14248a62457c8087c4b05a1c /src/script/interpreter.h
parent540413d9958fd253d4bf99858db431164db275e1 (diff)
downloadbitcoin-821f3e67510b9ea0b5c7b79d162daf5f0f075462.tar.xz
Require compressed keys in segwit as policy and disable signing with uncompressed keys for segwit scripts
Github-Pull: #8499 Rebased-From: 4c0c25a604cec39675187507df423cff5d707ab5
Diffstat (limited to 'src/script/interpreter.h')
-rw-r--r--src/script/interpreter.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 0adc9482ff..79894c5300 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -102,6 +102,10 @@ enum
// Signature(s) must be empty vector if an CHECK(MULTI)SIG operation failed
//
SCRIPT_VERIFY_NULLFAIL = (1U << 14),
+
+ // Public keys in segregated witness scripts must be compressed
+ //
+ SCRIPT_VERIFY_WITNESS_PUBKEYTYPE = (1U << 15),
};
bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);