From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sun, 9 Nov 2014 00:08:36 +0000 (+0000)
Subject: Disable manual host key config in mid-session.
X-Git-Tag: 0.64~27
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cda67c7c44bd1b1aef29fa9dc27118aa5ba35e2c;hp=-c;p=PuTTY.git

Disable manual host key config in mid-session.

Changing it can't have any useful effect, since we have strictly
enforced that the host key used for rekeys is the same as the first key
exchange since b8e668c.
---

cda67c7c44bd1b1aef29fa9dc27118aa5ba35e2c
diff --git a/config.c b/config.c
index 7e4cc242..711028c7 100644
--- a/config.c
+++ b/config.c
@@ -2202,7 +2202,7 @@ void setup_config_box(struct controlbox *b, int midsession,
 
 	/*
 	 * The Connection/SSH/Kex panel. (Owing to repeat key
-	 * exchange, this is all meaningful in mid-session _if_
+	 * exchange, much of this is meaningful in mid-session _if_
 	 * we're using SSH-2 or haven't decided yet.)
 	 */
 	if (protcfginfo != 1) {
@@ -2231,7 +2231,14 @@ void setup_config_box(struct controlbox *b, int midsession,
 			 I(16));
 	    ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
 		      HELPCTX(ssh_kex_repeat));
+	}
 
+	/*
+	 * Manual host key configuration is irrelevant mid-session,
+	 * as we enforce that the host key for rekeys is the
+	 * same as that used at the start of the session.
+	 */
+	if (!midsession) {
 	    s = ctrl_getset(b, "Connection/SSH/Kex", "hostkeys",
 			    "Manually configure host keys for this connection");