From: Simon Tatham <anakin@pobox.com>
Date: Wed, 7 Aug 2002 17:57:06 +0000 (+0000)
Subject: Oops. Didn't quite get the new SSH protocol selection code right. *blush*
X-Git-Tag: 0.53~43
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5ac941933a71a5c31053eea85fabaccf58ae480c;hp=6bfb676d8b318bdf35408f0fa5c91eec31942805;p=PuTTY.git

Oops. Didn't quite get the new SSH protocol selection code right. *blush*

[originally from svn r1818]
---

diff --git a/ssh.c b/ssh.c
index a3ac60b4..7cc9d20e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1773,7 +1773,7 @@ static int do_ssh_init(unsigned char c)
     /* Anything strictly below "2.0" means protocol 1 is supported. */
     proto1 = ssh_versioncmp(version, "2.0") < 0;
     /* Anything greater or equal to "1.99" means protocol 2 is supported. */
-    proto2 = ssh_versioncmp(version, "1.99") > 0;
+    proto2 = ssh_versioncmp(version, "1.99") >= 0;
 
     if (cfg.sshprot == 0 && !proto1) {
 	bombout(("SSH protocol version 1 required by user but not provided by server"));
@@ -1784,7 +1784,7 @@ static int do_ssh_init(unsigned char c)
 	crReturn(0);
     }
 
-    if (proto2 && (cfg.sshprot == 2 || !proto1)) {
+    if (proto2 && (cfg.sshprot >= 2 || !proto1)) {
 	/*
 	 * Use v2 protocol.
 	 */