openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-05-01 09:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

print protocol mismatch message if version exchange fails

Browse Source
This commit is contained in:
Markus Friedl
2012-02-23 14:33:08 +01:00
parent 6e99587584
commit fbeeedc2c2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssh/ssh_api.c
View File

@@ -248,6 +248,7 @@ _ssh_read_banner(struct ssh *ssh, char **bannerp)
{
struct sshbuf *input;
char *s, buf[256], remote_version[256]; /* must be same size! */
const char *mismatch = "Protocol mismatch.\r\n";
int r, remote_major, remote_minor;
size_t i, n, j, len;
@@ -274,8 +275,12 @@ _ssh_read_banner(struct ssh *ssh, char **bannerp)
if (strncmp(buf, "SSH-", 4) == 0)
break;
debug("ssh_exchange_identification: %s", buf);
if (ssh->kex->server || ++n > 65536)
if (ssh->kex->server || ++n > 65536) {
if ((r = sshbuf_put(ssh_packet_get_output(ssh),
mismatch, strlen(mismatch))) != 0)
return r;
return SSH_ERR_NO_PROTOCOL_VERSION;
}
}
if ((r = sshbuf_consume(input, j)) != 0)
return r;