diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2014-02-24 11:59:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2014-02-24 11:59:27 -0500 |
| commit | c72204e5686cbfc363e455d8984f266f04e87b3e (patch) | |
| tree | aefbc3971cfa8a9c22d40712febd1af8cd488d12 | |
| parent | 4fd082ded7af28929e909843eba5c801fe755257 (diff) | |
| parent | 595b6d88d41c0cadf9411b3aaef5585e2060e739 (diff) | |
| download | bitcoin-c72204e5686cbfc363e455d8984f266f04e87b3e.tar.xz | |
Merge pull request #3718 from jgarzik/pubkey-size
script: tighten multisig non-standard rules: do not relay pubkeys above 65 bytes
| -rw-r--r-- | src/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.cpp b/src/script.cpp index 83fc91956c..f03a1e3cbb 100644 --- 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); } |