diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-25 19:11:26 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-25 19:19:07 +0200 |
| commit | 48efbdbe986355bd2478f0fdd366b20952fbf30a (patch) | |
| tree | b4581561aa9d51763bda985063d0ce4913cef19d /src/script/interpreter.cpp | |
| parent | 486270854ec0f89e798f2baff3fe01623a274ed4 (diff) | |
| parent | af3208bfa6967d6b35aecf0ba35d9d6bf0f8317e (diff) | |
Merge pull request #5264
af3208b Resolve issue 3166. These changes decode valid SIGHASH types on signatures in assembly (asm) representations of scriptSig scripts. This squashed commit incorporates substantial helpful feedback from jtimon, laanwj, and sipa. (mruddy)
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index bd5e54b33f..d3aec26020 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -188,7 +188,7 @@ bool static IsDefinedHashtypeSignature(const valtype &vchSig) { return true; } -bool static CheckSignatureEncoding(const valtype &vchSig, unsigned int flags, ScriptError* serror) { +bool CheckSignatureEncoding(const vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror) { // Empty signature. Not strictly DER encoded, but allowed to provide a // compact way to provide an invalid signature for use with CHECK(MULTI)SIG if (vchSig.size() == 0) { |