From f25d6cdfc8dbe56d64b79276580baba2ec61552f Mon Sep 17 00:00:00 2001
From: Markus Friedl <mfriedl@gmail.com>
Date: Fri, 20 Jan 2012 00:19:24 +0100
Subject: [PATCH] rename kex_finish() to kex_send_newkeys()

---
 ssh/kex.c      | 6 ++----
 ssh/kex.h      | 4 ++--
 ssh/kexdhc.c   | 2 +-
 ssh/kexdhs.c   | 2 +-
 ssh/kexecdhc.c | 2 +-
 ssh/kexecdhs.c | 2 +-
 ssh/kexgexc.c  | 2 +-
 ssh/kexgexs.c  | 2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ssh/kex.c b/ssh/kex.c
index a2f2d55..53c117a 100644
--- a/ssh/kex.c
+++ b/ssh/kex.c
@@ -176,7 +176,7 @@ kex_reset_dispatch(struct ssh *ssh)
 }
 
 int
-kex_finish(struct ssh *ssh)
+kex_send_newkeys(struct ssh *ssh)
 {
 	int r;
 
@@ -200,7 +200,6 @@ kex_input_newkeys(int type, u_int32_t seq, struct ssh *ssh)
 	ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
 	if ((r = sshpkt_get_end(ssh)) != 0)
 		return r;
-
 	kex->done = 1;
 	sshbuf_reset(kex->peer);
 	/* sshbuf_reset(kex->my); */
@@ -477,9 +476,8 @@ kex_choose_conf(struct ssh *ssh)
 	Kex *kex = ssh->kex;
 
 	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0 ||
-	    (r = kex_buf2prop(kex->peer, &first_kex_follows, &peer)) != 0) {
+	    (r = kex_buf2prop(kex->peer, &first_kex_follows, &peer)) != 0)
 		goto out;
-	}
 
 	if (kex->server) {
 		cprop=peer;
diff --git a/ssh/kex.h b/ssh/kex.h
index 318d4b8..9c369bb 100644
--- a/ssh/kex.h
+++ b/ssh/kex.h
@@ -135,9 +135,8 @@ struct Kex {
 
 int	 kex_names_valid(const char *);
 
-int	kex_new(struct ssh *, char *[PROPOSAL_MAX], Kex **);
+int	 kex_new(struct ssh *, char *[PROPOSAL_MAX], Kex **);
 int	 kex_setup(struct ssh *, char *[PROPOSAL_MAX]);
-int	 kex_finish(struct ssh *);
 void	 kex_free(Kex *);
 
 int	 kex_buf2prop(struct sshbuf *, int *, char ***);
@@ -147,6 +146,7 @@ void	 kex_prop_free(char **);
 int	 kex_send_kexinit(struct ssh *);
 int	 kex_input_kexinit(int, u_int32_t, struct ssh *);
 int	 kex_derive_keys(struct ssh *, u_char *, u_int, BIGNUM *);
+int	 kex_send_newkeys(struct ssh *);
 
 Newkeys *kex_get_newkeys(struct ssh *, int);
 
diff --git a/ssh/kexdhc.c b/ssh/kexdhc.c
index 253085d..38856f1 100644
--- a/ssh/kexdhc.c
+++ b/ssh/kexdhc.c
@@ -181,7 +181,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
 	}
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	DH_free(kex->dh);
 	kex->dh = NULL;
diff --git a/ssh/kexdhs.c b/ssh/kexdhs.c
index 5429146..5320eca 100644
--- a/ssh/kexdhs.c
+++ b/ssh/kexdhs.c
@@ -190,7 +190,7 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
 		goto out;
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	DH_free(kex->dh);
 	kex->dh = NULL;
diff --git a/ssh/kexecdhc.c b/ssh/kexecdhc.c
index 243e9b1..90ce09d 100644
--- a/ssh/kexecdhc.c
+++ b/ssh/kexecdhc.c
@@ -199,7 +199,7 @@ input_kex_ecdh_reply(int type, u_int32_t seq, struct ssh *ssh)
 	}
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	if (kex->ec_client_key) {
 		EC_KEY_free(kex->ec_client_key);
diff --git a/ssh/kexecdhs.c b/ssh/kexecdhs.c
index cb53702..ecea109 100644
--- a/ssh/kexecdhs.c
+++ b/ssh/kexecdhs.c
@@ -185,7 +185,7 @@ input_kex_ecdh_init(int type, u_int32_t seq, struct ssh *ssh)
 		goto out;
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	if (kex->ec_client_key) {
 		EC_KEY_free(kex->ec_client_key);
diff --git a/ssh/kexgexc.c b/ssh/kexgexc.c
index 6fdd46b..55c2fb6 100644
--- a/ssh/kexgexc.c
+++ b/ssh/kexgexc.c
@@ -241,7 +241,7 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
 	}
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	DH_free(kex->dh);
 	kex->dh = NULL;
diff --git a/ssh/kexgexs.c b/ssh/kexgexs.c
index ffc0494..73f2013 100644
--- a/ssh/kexgexs.c
+++ b/ssh/kexgexs.c
@@ -248,7 +248,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh)
 		goto out;
 
 	if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
-		r = kex_finish(ssh);
+		r = kex_send_newkeys(ssh);
  out:
 	DH_free(kex->dh);
 	kex->dh = NULL;