Merge pull request #3718 from jgarzik/pubkey-size

Jeff Garzik · Jeff Garzik · commit c72204e5686c · 2014-02-24T11:59:27.000-05:00
script: tighten multisig non-standard rules: do not relay pubkeys above 65 bytes
diff --git a/src/script.cpp b/src/script.cpp
@@ -1261,7 +1261,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
             // Template matching opcodes:
             if (opcode2 == OP_PUBKEYS)
             {
-                while (vch1.size() >= 33 && vch1.size() <= 120)
+                while (vch1.size() >= 33 && vch1.size() <= 65)
                 {
                     vSolutionsRet.push_back(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 (vch1.size() < 33 || vch1.size() > 120)
+                if (vch1.size() < 33 || vch1.size() > 65)
                     break;
                 vSolutionsRet.push_back(vch1);
             }

Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi`
`1261`	`1261`	`// Template matching opcodes:`
`1262`	`1262`	`if (opcode2 == OP_PUBKEYS)`
`1263`	`1263`	`{`
`1264`		`- while (vch1.size() >= 33 && vch1.size() <= 120)`
	`1264`	`+ while (vch1.size() >= 33 && vch1.size() <= 65)`
`1265`	`1265`	`{`
`1266`	`1266`	`vSolutionsRet.push_back(vch1);`
`1267`	`1267`	`if (!script1.GetOp(pc1, opcode1, vch1))`
`@@ -1275,7 +1275,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi`
`1275`	`1275`
`1276`	`1276`	`if (opcode2 == OP_PUBKEY)`
`1277`	`1277`	`{`
`1278`		`- if (vch1.size() < 33 \|\| vch1.size() > 120)`
	`1278`	`+ if (vch1.size() < 33 \|\| vch1.size() > 65)`
`1279`	`1279`	`break;`
`1280`	`1280`	`vSolutionsRet.push_back(vch1);`
`1281`	`1281`	`}`