From 900078aeb4088b63ee271e774a00ccd126628528 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 21 Oct 2014 16:05:51 -0400 Subject: boost: moveonly: create eccryptoverify.h|cpp and move helper functions there Eventually (after 0.10) these files will hold the logic for crypto verification routines, and CKey/CPubKey will call into them. --- src/script/interpreter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/script') diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 3625972ebf..e1e242882f 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -9,6 +9,7 @@ #include "crypto/ripemd160.h" #include "crypto/sha1.h" #include "crypto/sha2.h" +#include "eccryptoverify.h" #include "key.h" #include "script/script.h" #include "uint256.h" @@ -122,7 +123,7 @@ bool static IsLowDERSignature(const valtype &vchSig) { // If the S value is above the order of the curve divided by two, its // complement modulo the order could have been used instead, which is // one byte shorter when encoded correctly. - if (!CKey::CheckSignatureElement(S, nLenS, true)) + if (!eccrypto::CheckSignatureElement(S, nLenS, true)) return error("Non-canonical signature: S value is unnecessarily high"); return true; -- cgit v1.2.3 From d2e74c55bdd8cee6a0cca49aca0e2ab1a182c9b5 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 28 Oct 2014 17:47:18 -0400 Subject: boost: moveonly: split CPubKey and friends to new files --- src/script/interpreter.cpp | 2 +- src/script/sigcache.cpp | 2 +- src/script/standard.cpp | 1 + src/script/standard.h | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/script') diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index e1e242882f..54c2847f79 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -10,7 +10,7 @@ #include "crypto/sha1.h" #include "crypto/sha2.h" #include "eccryptoverify.h" -#include "key.h" +#include "pubkey.h" #include "script/script.h" #include "uint256.h" #include "util.h" diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index ab366898d8..d76a5acd63 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -5,7 +5,7 @@ #include "sigcache.h" -#include "key.h" +#include "pubkey.h" #include "random.h" #include "uint256.h" #include "util.h" diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 05938961bc..9cae0508e1 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -5,6 +5,7 @@ #include "script/standard.h" +#include "pubkey.h" #include "script/script.h" #include "util.h" #include "utilstrencodings.h" diff --git a/src/script/standard.h b/src/script/standard.h index 248b941a64..171178ce3d 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -6,8 +6,7 @@ #ifndef H_BITCOIN_SCRIPT_STANDARD #define H_BITCOIN_SCRIPT_STANDARD -#include "key.h" -#include "script/script.h" +#include "uint256.h" #include "script/interpreter.h" #include @@ -15,6 +14,7 @@ #include class CScript; +class CKeyID; /** A reference to a CScript: the Hash160 of its serialization (see script.h) */ class CScriptID : public uint160 -- cgit v1.2.3