GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #610: All peg-out related detection pushes should be <= OP_PUSHDATA4

Browse source 
cff50f5 All peg-out related detection pushes should be <= OP_PUSHDATA4 (Gregory Sanders)

Pull request description:

  related to https://github.com/ElementsProject/elements/issues/598 , https://github.com/ElementsProject/elements/issues/596, https://github.com/ElementsProject/elements/pull/597

  This does not affect consensus, but affects consumers of these parsing rules such as rust-elements.

  cc @apoelstra @roconnor-blockstream

Tree-SHA512: 4ab6f0be52c3804b2af43c7b3eecbbe8f2868d3f33385dc54f3acb0e441188018a2b3df197801f2c20fa96e224b6acacb642ecf2f030227618e0aea1e2da44ea
This commit is contained in:
Gregory Sanders 2019-06-05 11:28:24 +02:00
commit 1ccb0b67f9
No known key found for this signature in database
GPG key ID: F3F68E2D86A48FDB
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/primitives/pak.cpp
View file

@ -185,7 +185,7 @@ bool ScriptHasValidPAKProof(const CScript& script, const uint256& genesis_hash)
std::vector<unsigned char> extracted_pubkey_hash;
// Get full pubkey
if (!script.GetOp(pc, opcode, data) || opcode != 33 || data.size() != 33) {
if (!script.GetOp(pc, opcode, data) || data.size() != 33 || opcode > OP_PUSHDATA4) {
return false;
}
CPubKey full_pubkey(data.begin(), data.end());

11
src/script/script.cpp
View file

@ -213,17 +213,24 @@ bool CScript::IsPegoutScript(uint256& genesis_hash, CScript& pegout_scriptpubkey
return false;
}
if (!GetOp(pc, opcode, data) || data.size() != 32 ) {
if (!GetOp(pc, opcode, data) || data.size() != 32 || opcode > OP_PUSHDATA4) {
return false;
}
genesis_hash = uint256(data);
// Read in parent chain destination scriptpubkey
if (!GetOp(pc, opcode, data) || data.size() == 0 ) {
if (!GetOp(pc, opcode, data) || opcode > OP_PUSHDATA4 ) {
return false;
}
pegout_scriptpubkey = CScript(data.begin(), data.end());
// All extra opcodes must be pushes
while(GetOp(pc, opcode, data)) {
if (opcode > OP_PUSHDATA4) {
return false;
}
}
return true;
}