script: tighten multisig non-standard rules: do not relay pubkeys above 65 bytes

This commit is contained in:
Jeff Garzik 2014-02-21 02:26:51 -05:00
parent 76a77059f3
commit 595b6d88d4

View File

@ -1261,7 +1261,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
// Template matching opcodes: // Template matching opcodes:
if (opcode2 == OP_PUBKEYS) if (opcode2 == OP_PUBKEYS)
{ {
while (vch1.size() >= 33 && vch1.size() <= 120) while (vch1.size() >= 33 && vch1.size() <= 65)
{ {
vSolutionsRet.push_back(vch1); vSolutionsRet.push_back(vch1);
if (!script1.GetOp(pc1, opcode1, vch1)) if (!script1.GetOp(pc1, opcode1, vch1))
@ -1275,7 +1275,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
if (opcode2 == OP_PUBKEY) if (opcode2 == OP_PUBKEY)
{ {
if (vch1.size() < 33 || vch1.size() > 120) if (vch1.size() < 33 || vch1.size() > 65)
break; break;
vSolutionsRet.push_back(vch1); vSolutionsRet.push_back(vch1);
} }