nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

And now I look at it, the latest draft also says version strings

Browse Source 
should be followed by \r\n, not just \n.

[originally from svn r4940]
This commit is contained in:
Simon Tatham 2004-12-01 13:42:50 +00:00
parent 22c46786be
commit 4c31b113a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh.c
View File

@ -2184,13 +2184,13 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
/* /*
* Construct a v2 version string. * Construct a v2 version string.
*/ */
verstring = dupprintf("SSH-2.0-%s\n", sshver); verstring = dupprintf("SSH-2.0-%s\r\n", sshver);
ssh->version = 2; ssh->version = 2;
} else { } else {
/* /*
* Construct a v1 version string. * Construct a v1 version string.
*/ */
verstring = dupprintf("SSH-%s-%s\n", verstring = dupprintf("SSH-%s-%s\r\n",
(ssh_versioncmp(s->version, "1.5") <= 0 ? (ssh_versioncmp(s->version, "1.5") <= 0 ?
s->version : "1.5"), s->version : "1.5"),
sshver); sshver);
@ -2204,8 +2204,10 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
* Hash our version string and their version string. * Hash our version string and their version string.
*/ */
SHA_Init(&ssh->exhashbase); SHA_Init(&ssh->exhashbase);
sha_string(&ssh->exhashbase, verstring, strlen(verstring)-1); sha_string(&ssh->exhashbase, verstring,
sha_string(&ssh->exhashbase, s->vstring, strcspn(s->vstring, "\r\n")); strcspn(verstring, "\r\n"));
sha_string(&ssh->exhashbase, s->vstring,
strcspn(s->vstring, "\r\n"));
/* /*
* Initialise SSHv2 protocol. * Initialise SSHv2 protocol.
@ -2222,7 +2224,7 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
ssh->s_rdpkt = ssh1_rdpkt; ssh->s_rdpkt = ssh1_rdpkt;
} }
logeventf(ssh, "We claim version: %.*s", logeventf(ssh, "We claim version: %.*s",
strlen(verstring)-1, verstring); strcspn(verstring, "\r\n"), verstring);
sk_write(ssh->s, verstring, strlen(verstring)); sk_write(ssh->s, verstring, strlen(verstring));
sfree(verstring); sfree(verstring);
} }