Add SimpleSignatureChecker, SCRIPT_NO_SIGHASH_BYTE validation flag

This commit is contained in:
Gregory Sanders 2018-12-05 19:52:21 +01:00
parent 6c91446982
commit 7bc578a398
6 changed files with 78 additions and 6 deletions

View file

@ -203,12 +203,20 @@ bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned i
if (vchSig.size() == 0) {
return true;
}
if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_STRICTENC)) != 0 && !IsValidSignatureEncoding(vchSig)) {
bool no_hash_byte = (flags & SCRIPT_NO_SIGHASH_BYTE) == SCRIPT_NO_SIGHASH_BYTE;
std::vector<unsigned char> vchSigCopy(vchSig.begin(), vchSig.begin() + vchSig.size());
// Push a dummy sighash byte to pass checks
if (no_hash_byte) {
vchSigCopy.push_back(SIGHASH_ALL);
}
if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_STRICTENC)) != 0 && !IsValidSignatureEncoding(vchSigCopy)) {
return set_error(serror, SCRIPT_ERR_SIG_DER);
} else if ((flags & SCRIPT_VERIFY_LOW_S) != 0 && !IsLowDERSignature(vchSig, serror)) {
} else if ((flags & SCRIPT_VERIFY_LOW_S) != 0 && !IsLowDERSignature(vchSigCopy, serror)) {
// serror is set
return false;
} else if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsDefinedHashtypeSignature(vchSig)) {
} else if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsDefinedHashtypeSignature(vchSigCopy)) {
return set_error(serror, SCRIPT_ERR_SIG_HASHTYPE);
}
return true;