X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/39b8712f876f73d37e09bf56b861e1f024062f67..f4275b53be3317ee7391a48a4ac1d1681b3017bc:/ssh.c?ds=inline

diff --git a/ssh.c b/ssh.c
index a9bed27a..e0556a62 100644
--- a/ssh.c
+++ b/ssh.c
@@ -2249,7 +2249,8 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
 	  wc_match("OpenSSH_2.[0-4]*", imp) ||
 	  wc_match("OpenSSH_2.5.[0-3]*", imp) ||
 	  wc_match("Sun_SSH_1.0", imp) ||
-	  wc_match("Sun_SSH_1.0.1", imp)))) {
+	  wc_match("Sun_SSH_1.0.1", imp) ||
+	  wc_match("WeOnlyDo-1.2.6", imp)))) {
 	/*
 	 * These versions have the SSH-2 rekey bug.
 	 */
@@ -2295,23 +2296,20 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
 
     crBegin(ssh->do_ssh_init_crstate);
 
-    /* Search for the string "SSH-" in the input. */
-    s->i = 0;
-    while (1) {
-	static const int transS[] = { 1, 2, 2, 1 };
-	static const int transH[] = { 0, 0, 3, 0 };
-	static const int transminus[] = { 0, 0, 0, -1 };
-	if (c == 'S')
-	    s->i = transS[s->i];
-	else if (c == 'H')
-	    s->i = transH[s->i];
-	else if (c == '-')
-	    s->i = transminus[s->i];
-	else
-	    s->i = 0;
-	if (s->i < 0)
-	    break;
-	crReturn(1);		       /* get another character */
+    /* Search for a line beginning with the string "SSH-" in the input. */
+    for (;;) {
+	if (c != 'S') goto no;
+	crReturn(1);
+	if (c != 'S') goto no;
+	crReturn(1);
+	if (c != 'H') goto no;
+	crReturn(1);
+	if (c != '-') goto no;
+	break;
+      no:
+	while (c != '\012')
+	    crReturn(1);
+	crReturn(1);
     }
 
     s->vstrsize = 16;