nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge SSH-2-only default from 'pre-0.64'.

Browse Source
This commit is contained in:
Jacob Nevins
2014-11-08 19:35:57 +00:00
parent 5ffb20e4bf 9090c1bb69
commit 3b4f3266d8
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ssh.c
View File

@ -2966,11 +2966,13 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
s->proto2 = ssh_versioncmp(s->version, "1.99") >= 0;
if (conf_get_int(ssh->conf, CONF_sshprot) == 0 && !s->proto1) {
bombout(("SSH protocol version 1 required by user but not provided by server"));
bombout(("SSH protocol version 1 required by configuration but "
"not provided by server"));
crStop(0);
}
if (conf_get_int(ssh->conf, CONF_sshprot) == 3 && !s->proto2) {
bombout(("SSH protocol version 2 required by user but not provided by server"));
bombout(("SSH protocol version 2 required by configuration but "
"not provided by server"));
crStop(0);
}