aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

close_shutdown: make sure script_pubkey is standard.

Browse Source 
As per BOLT update 9c3f150d2a44af6ee2c3be03acd6ef80ea184f4e.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-08-31 16:06:32 +09:30
parent 2804a4de7a
commit f90fb4934f
3 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/packets.c
View File

@@ -567,10 +567,28 @@ Pkt *accept_pkt_close_shutdown(struct peer *peer, const Pkt *pkt)
{
const CloseShutdown *c = pkt->close_shutdown;
/* FIXME: Filter for non-standardness? */
/* BOLT #2:
*
* 1. `OP_DUP` `OP_HASH160` `20` 20-bytes `OP_EQUALVERIFY` `OP_CHECKSIG`
* (pay to pubkey hash), OR
* 2. `OP_HASH160` `20` 20-bytes `OP_EQUAL` (pay to script hash), OR
* 3. `OP_0` `20` 20-bytes (version 0 pay to witness pubkey), OR
* 4. `OP_0` `32` 32-bytes (version 0 pay to witness script hash)
*
* A node receiving `close_shutdown` SHOULD fail the connection
* `script_pubkey` is not one of those forms.
*/
if (!is_p2pkh(c->scriptpubkey.data, c->scriptpubkey.len)
&& !is_p2sh(c->scriptpubkey.data, c->scriptpubkey.len)
&& !is_p2wpkh(c->scriptpubkey.data, c->scriptpubkey.len)
&& !is_p2wsh(c->scriptpubkey.data, c->scriptpubkey.len)) {
log_broken_blob(peer->log, "Bad script_pubkey %s",
c->scriptpubkey.data, c->scriptpubkey.len);
return pkt_err(peer, "Bad script_pubkey");
}
peer->closing.their_script = tal_dup_arr(peer, u8,
c->scriptpubkey.data,
c->scriptpubkey.len, 0);
return NULL;
}