From bb348ab1eca44e16f1408ce9e6888c56da18a5fa Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Fri, 7 Jan 2005 09:24:24 +0000
Subject: [PATCH] Use sk_set_frozen() to ensure that no data will be accepted
 from an SSH connection when we're in the middle of asking the user a
 dialog-box-type question. Fixes `unix-kex-packet', which has just bitten me
 when connecting to one of the work Suns.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5071 cda61777-01e9-0310-a592-d414129be87e
---
 ssh.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/ssh.c b/ssh.c
index 3af4f610..25b74147 100644
--- a/ssh.c
+++ b/ssh.c
@@ -2834,8 +2834,11 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
 	}
 
 	/* Warn about chosen cipher if necessary. */
-	if (warn)
+	if (warn) {
+            sk_set_frozen(ssh->s, 1);
 	    askalg(ssh->frontend, "cipher", cipher_string);
+            sk_set_frozen(ssh->s, 0);
+        }
     }
 
     switch (s->cipher_type) {
@@ -4889,9 +4892,12 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen,
 		ssh->kex = k;
 	    }
 	    if (ssh->kex) {
-		if (s->warn)
+		if (s->warn) {
+                    sk_set_frozen(ssh->s, 1);
 		    askalg(ssh->frontend, "key-exchange algorithm",
 			   ssh->kex->name);
+                    sk_set_frozen(ssh->s, 0);
+                }
 		break;
 	    }
 	}
@@ -4922,9 +4928,12 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen,
 		}
 	    }
 	    if (s->cscipher_tobe) {
-		if (s->warn)
+		if (s->warn) {
+                    sk_set_frozen(ssh->s, 1);
 		    askalg(ssh->frontend, "client-to-server cipher",
 			   s->cscipher_tobe->name);
+                    sk_set_frozen(ssh->s, 0);
+                }
 		break;
 	    }
 	}
@@ -4949,9 +4958,12 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen,
 		}
 	    }
 	    if (s->sccipher_tobe) {
-		if (s->warn)
+		if (s->warn) {
+                    sk_set_frozen(ssh->s, 1);
 		    askalg(ssh->frontend, "server-to-client cipher",
 			   s->sccipher_tobe->name);
+                    sk_set_frozen(ssh->s, 0);
+                }
 		break;
 	    }
 	}
@@ -5108,9 +5120,11 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen,
      */
     s->keystr = ssh->hostkey->fmtkey(s->hkey);
     s->fingerprint = ssh->hostkey->fingerprint(s->hkey);
+    sk_set_frozen(ssh->s, 1);
     verify_ssh_host_key(ssh->frontend,
 			ssh->savedhost, ssh->savedport, ssh->hostkey->keytype,
 			s->keystr, s->fingerprint);
+    sk_set_frozen(ssh->s, 0);
     if (!s->got_session_id) {     /* don't bother logging this in rekeys */
 	logevent("Host key fingerprint is:");
 	logevent(s->fingerprint);
-- 
2.11.0