mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

Revert: 064309df1a "peer: signature in commit_info is always valid."

Browse Source 
It's not quite true: if we offer the anchor, we have a commitinfo
without their signature yet.  So make it a pointer again.  Since we
always allocate struct commit_info with talz, it starts as a NULL
pointer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-05-04 16:13:50 +09:30
parent c94f77fd14
commit f6b36b9be3
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
daemon/packets.c
View File

@ -141,10 +141,12 @@ void queue_pkt_anchor(struct peer *peer)
} }
/* Sign their commit sig */ /* Sign their commit sig */
peer->them.commit->sig.stype = SIGHASH_ALL; peer->them.commit->sig = tal(peer->them.commit,
struct bitcoin_signature);
peer->them.commit->sig->stype = SIGHASH_ALL;
peer_sign_theircommit(peer, peer->them.commit->tx, peer_sign_theircommit(peer, peer->them.commit->tx,
&peer->them.commit->sig.sig); &peer->them.commit->sig->sig);
a->commit_sig = signature_to_proto(a, &peer->them.commit->sig.sig); a->commit_sig = signature_to_proto(a, &peer->them.commit->sig->sig);
queue_pkt(peer, PKT__PKT_OPEN_ANCHOR, a); queue_pkt(peer, PKT__PKT_OPEN_ANCHOR, a);
} }
@ -158,10 +160,12 @@ void queue_pkt_open_commit_sig(struct peer *peer)
dump_tx("Creating sig for:", peer->them.commit->tx); dump_tx("Creating sig for:", peer->them.commit->tx);
dump_key("Using key:", &peer->us.commitkey); dump_key("Using key:", &peer->us.commitkey);
peer->them.commit->sig.stype = SIGHASH_ALL; peer->them.commit->sig = tal(peer->them.commit,
struct bitcoin_signature);
peer->them.commit->sig->stype = SIGHASH_ALL;
peer_sign_theircommit(peer, peer->them.commit->tx, peer_sign_theircommit(peer, peer->them.commit->tx,
&peer->them.commit->sig.sig); &peer->them.commit->sig->sig);
s->sig = signature_to_proto(s, &peer->them.commit->sig.sig); s->sig = signature_to_proto(s, &peer->them.commit->sig->sig);
queue_pkt(peer, PKT__PKT_OPEN_COMMIT_SIG, s); queue_pkt(peer, PKT__PKT_OPEN_COMMIT_SIG, s);
} }
@ -314,8 +318,9 @@ void queue_pkt_commit(struct peer *peer)
*/ */
assert(ci->prev->cstate->changes != ci->cstate->changes); assert(ci->prev->cstate->changes != ci->cstate->changes);
ci->sig.stype = SIGHASH_ALL; ci->sig = tal(ci, struct bitcoin_signature);
peer_sign_theircommit(peer, ci->tx, &ci->sig.sig); ci->sig->stype = SIGHASH_ALL;
peer_sign_theircommit(peer, ci->tx, &ci->sig->sig);
/* Switch to the new commitment. */ /* Switch to the new commitment. */
peer->them.commit = ci; peer->them.commit = ci;
@ -324,7 +329,7 @@ void queue_pkt_commit(struct peer *peer)
/* Now send message */ /* Now send message */
update_commit__init(u); update_commit__init(u);
u->sig = signature_to_proto(u, &ci->sig.sig); u->sig = signature_to_proto(u, &ci->sig->sig);
u->ack = peer_outgoing_ack(peer); u->ack = peer_outgoing_ack(peer);
queue_pkt(peer, PKT__PKT_UPDATE_COMMIT, u); queue_pkt(peer, PKT__PKT_UPDATE_COMMIT, u);
@ -344,7 +349,7 @@ void queue_pkt_revocation(struct peer *peer)
assert(!peer->us.commit->prev->revocation_preimage); assert(!peer->us.commit->prev->revocation_preimage);
/* We have their signature on the current one, right? */ /* We have their signature on the current one, right? */
memcheck(&peer->us.commit->sig, sizeof(peer->us.commit->sig)); assert(peer->us.commit->sig);
peer->us.commit->prev->revocation_preimage peer->us.commit->prev->revocation_preimage
= tal(peer->us.commit->prev, struct sha256); = tal(peer->us.commit->prev, struct sha256);
@ -477,8 +482,10 @@ static Pkt *check_and_save_commit_sig(struct peer *peer,
struct commit_info *ci, struct commit_info *ci,
const Signature *pb) const Signature *pb)
{ {
ci->sig.stype = SIGHASH_ALL; assert(!ci->sig);
if (!proto_to_signature(pb, &ci->sig.sig)) ci->sig = tal(ci, struct bitcoin_signature);
ci->sig->stype = SIGHASH_ALL;
if (!proto_to_signature(pb, &ci->sig->sig))
return pkt_err(peer, "Malformed signature"); return pkt_err(peer, "Malformed signature");
/* Their sig should sign our commit tx. */ /* Their sig should sign our commit tx. */
@ -487,7 +494,7 @@ static Pkt *check_and_save_commit_sig(struct peer *peer,
NULL, 0, NULL, 0,
peer->anchor.witnessscript, peer->anchor.witnessscript,
&peer->them.commitkey, &peer->them.commitkey,
&ci->sig)) ci->sig))
return pkt_err(peer, "Bad signature"); return pkt_err(peer, "Bad signature");
return NULL; return NULL;

2
daemon/peer.c
View File

@ -1294,7 +1294,7 @@ const struct bitcoin_tx *bitcoin_commit(struct peer *peer)
peer->us.commit->tx->input[0].witness peer->us.commit->tx->input[0].witness
= bitcoin_witness_2of2(peer->us.commit->tx->input, = bitcoin_witness_2of2(peer->us.commit->tx->input,
&peer->us.commit->sig, peer->us.commit->sig,
&sig, &sig,
&peer->them.commitkey, &peer->them.commitkey,
&peer->us.commitkey); &peer->us.commitkey);

4
daemon/peer.h
View File

@ -61,8 +61,8 @@ struct commit_info {
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
/* Channel state for this tx. */ /* Channel state for this tx. */
struct channel_state *cstate; struct channel_state *cstate;
/* Other side's signature for this commit tx. */ /* Other side's signature for last commit tx (if known) */
struct bitcoin_signature sig; struct bitcoin_signature *sig;
/* Map for permutation: see commit_tx.c */ /* Map for permutation: see commit_tx.c */
int *map; int *map;
/* Revocation preimage (if known). */ /* Revocation preimage (if known). */