mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-02-04 06:02:24 +00:00
Oops. Didn't quite get the new SSH protocol selection code right. *blush*
[originally from svn r1818]
This commit is contained in:
parent
6bfb676d8b
commit
5ac941933a
4
ssh.c
4
ssh.c
@ -1773,7 +1773,7 @@ static int do_ssh_init(unsigned char c)
|
|||||||
/* Anything strictly below "2.0" means protocol 1 is supported. */
|
/* Anything strictly below "2.0" means protocol 1 is supported. */
|
||||||
proto1 = ssh_versioncmp(version, "2.0") < 0;
|
proto1 = ssh_versioncmp(version, "2.0") < 0;
|
||||||
/* Anything greater or equal to "1.99" means protocol 2 is supported. */
|
/* 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) {
|
if (cfg.sshprot == 0 && !proto1) {
|
||||||
bombout(("SSH protocol version 1 required by user but not provided by server"));
|
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);
|
crReturn(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (proto2 && (cfg.sshprot == 2 || !proto1)) {
|
if (proto2 && (cfg.sshprot >= 2 || !proto1)) {
|
||||||
/*
|
/*
|
||||||
* Use v2 protocol.
|
* Use v2 protocol.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user