From 2bd967af35bbc8b470180293bd89d0abfa45f745 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 9 Jun 2015 10:56:51 +0930
Subject: [PATCH] update-channel-accept: check their signature is valid.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 signature.c             | 18 ++++++++++++++++++
 signature.h             |  6 ++++++
 update-channel-accept.c | 37 +++++++++++++++++++++++++------------
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/signature.c b/signature.c
index bd9d5b452..9c7a0541d 100644
--- a/signature.c
+++ b/signature.c
@@ -136,6 +136,24 @@ out:
         return ok;
 }
 
+bool check_tx_sig(struct bitcoin_tx *tx, size_t input_num,
+		  const u8 *redeemscript, size_t redeemscript_len,
+		  const struct pubkey *key,
+		  const struct bitcoin_signature *sig)
+{
+	struct sha256_double hash;
+	assert(input_num < tx->input_count);
+
+	sha256_tx_one_input(tx, input_num, redeemscript, redeemscript_len,
+			    &hash);
+
+	/* We only use SIGHASH_ALL for the moment. */
+	if (sig->stype != SIGHASH_ALL)
+		return false;
+	
+	return check_signed_hash(&hash, &sig->sig, key);
+}
+
 bool check_2of2_sig(struct bitcoin_tx *tx, size_t input_num,
 		    const u8 *redeemscript, size_t redeemscript_len,
 		    const struct pubkey *key1, const struct pubkey *key2,
diff --git a/signature.h b/signature.h
index c9c9d6d87..d3b0c5af1 100644
--- a/signature.h
+++ b/signature.h
@@ -34,6 +34,12 @@ bool sign_tx_input(const tal_t *ctx, struct bitcoin_tx *tx,
 		   const u8 *subscript, size_t subscript_len,
 		   EC_KEY *privkey, struct signature *sig);
 
+/* Does this sig sign the tx with this input for this pubkey. */
+bool check_tx_sig(struct bitcoin_tx *tx, size_t input_num,
+		  const u8 *redeemscript, size_t redeemscript_len,
+		  const struct pubkey *key,
+		  const struct bitcoin_signature *sig);
+
 bool check_2of2_sig(struct bitcoin_tx *tx, size_t input_num,
 		    const u8 *redeemscript, size_t redeemscript_len,
 		    const struct pubkey *key1, const struct pubkey *key2,
diff --git a/update-channel-accept.c b/update-channel-accept.c
index 9e85642af..415bbf284 100644
--- a/update-channel-accept.c
+++ b/update-channel-accept.c
@@ -24,19 +24,19 @@
 int main(int argc, char *argv[])
 {
 	const tal_t *ctx = tal_arr(NULL, char, 0);
-	struct sha256 seed, revocation_hash, revocation_preimage;
+	struct sha256 seed, revocation_hash, revocation_preimage, their_rhash;
 	OpenChannel *o1, *o2;
 	Update *update;
 	struct bitcoin_tx *anchor, *commit;
 	struct sha256_double anchor_txid;
 	struct pkt *pkt;
-	struct signature sig;
+	struct bitcoin_signature sig;
 	EC_KEY *privkey;
 	bool testnet;
 	struct pubkey pubkey1, pubkey2;
 	u8 *redeemscript;
 	int64_t delta;
-	size_t i;
+	size_t i, p2sh_out;
 
 	err_set_progname(argv[0]);
 
@@ -66,6 +66,10 @@ int main(int argc, char *argv[])
 
 	update = pkt_from_file(argv[6], PKT__PKT_UPDATE)->update;
 	
+	sig.stype = SIGHASH_ALL;
+	if (!proto_to_signature(update->sig, &sig.sig))
+		errx(1, "Invalid update signature");
+
 	/* Figure out cumulative delta since anchor. */
 	delta = update->delta;
 	for (i = 7; i < argc; i++) {
@@ -89,28 +93,37 @@ int main(int argc, char *argv[])
 
 	/* This is what the anchor pays to; figure out whick output. */
 	redeemscript = bitcoin_redeem_2of2(ctx, &pubkey1, &pubkey2);
+	p2sh_out = find_p2sh_out(anchor, redeemscript);
 
+	/* Check our new commit is signed correctly by them. */
+	proto_to_sha256(update->revocation_hash, &their_rhash);
+	commit = create_commit_tx(ctx, o1, o2, &their_rhash, delta,
+				  &anchor_txid, p2sh_out);
+	if (!commit)
+		errx(1, "Delta too large");
+
+	/* Check their signature signs this input correctly. */
+	if (!check_tx_sig(commit, 0, redeemscript, tal_count(redeemscript),
+			  &pubkey2, &sig))
+		errx(1, "Invalid signature.");
+	
 	/* Now create THEIR new commitment tx to spend 2/2 output of anchor. */
 	commit = create_commit_tx(ctx, o2, o1, &revocation_hash, delta,
-				  &anchor_txid,
-				  find_p2sh_out(anchor, redeemscript));
+				  &anchor_txid, p2sh_out);
 
 	/* If contributions don't exceed fees, this fails. */
 	if (!commit)
 		errx(1, "Delta too large");
 
-	/* Their pubkey must be valid */
-	if (!proto_to_pubkey(o2->anchor->pubkey, &pubkey2))
-		errx(1, "Invalid public open-channel-file2");
-
 	/* Sign it for them. */
 	sign_tx_input(ctx, commit, 0, redeemscript, tal_count(redeemscript),
-		      privkey, &sig);
+		      privkey, &sig.sig);
 
 	/* Give up revocation preimage for old tx. */
 	shachain_from_seed(&seed, argc - 6 - 1, &revocation_preimage);
-
-	pkt = update_accept_pkt(ctx, &sig, &revocation_hash, &revocation_preimage);
+	
+	pkt = update_accept_pkt(ctx, &sig.sig,
+				&revocation_hash, &revocation_preimage);
 	if (!write_all(STDOUT_FILENO, pkt,
 		       sizeof(pkt->len) + le32_to_cpu(pkt->len)))
 		err(1, "Writing out packet");