diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-17 13:19:58 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-17 13:44:22 +0200 |
| commit | 438c7e4cd2179170aeadb4aa1c902ccd1256dee6 (patch) | |
| tree | d040fe5263589ae9718839e17ac5b31c276cc8f5 /src/script/interpreter.h | |
| parent | 5b9d1e10a831b6413b0f6ed54017c9d42139282f (diff) | |
| parent | 6dcfda2dc48bee2148acd571dce7d3f09608d7a2 (diff) | |
| download | bitcoin-438c7e4cd2179170aeadb4aa1c902ccd1256dee6.tar.xz | |
Merge pull request #4555
6dcfda2 Don't pass nHashType to EvalScript nor CheckSig (jtimon)
2b23a87 Don't pass nHashType to VerifyScript (jtimon)
ce3649fb Remove CScriptCheck::nHashType (was always 0) (jtimon)
358562b Remove unused function main:VerifySignature (jtimon)
Diffstat (limited to 'src/script/interpreter.h')
| -rw-r--r-- | src/script/interpreter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 6fbcd92a3d..adca2142ac 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -38,8 +38,8 @@ bool IsCanonicalPubKey(const std::vector<unsigned char> &vchPubKey, unsigned int bool IsCanonicalSignature(const std::vector<unsigned char> &vchSig, unsigned int flags); uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); -bool CheckSig(std::vector<unsigned char> vchSig, const std::vector<unsigned char> &vchPubKey, const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags); -bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); -bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); +bool CheckSig(std::vector<unsigned char> vchSig, const std::vector<unsigned char> &vchPubKey, const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int flags); +bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, unsigned int flags); +bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, unsigned int flags); #endif // H_BITCOIN_SCRIPT_INTERPRETER |