tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync

Browse Source 
- djm@cvs.openbsd.org 2006/06/14 10:50:42
     [sshconnect.c]
     limit the number of pre-banner characters we will accept; ok markus@
This commit is contained in:
Damien Miller 2006-07-10 20:15:56 +10:00
parent e34c96aea1
commit 1e88ea6556
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,9 @@
20060710 20060710
- (dtucker) [INSTALL] New autoconf version: 2.60. - (dtucker) [INSTALL] New autoconf version: 2.60.
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2006/06/14 10:50:42
[sshconnect.c]
limit the number of pre-banner characters we will accept; ok markus@
20060706 20060706
- (dtucker) [configure.ac] Try AIX blibpath test in different order when - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@ -4733,4 +4737,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4359 2006/07/10 02:55:24 dtucker Exp $ $Id: ChangeLog,v 1.4360 2006/07/10 10:15:56 djm Exp $

8
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.184 2006/06/08 14:45:49 markus Exp $ */ /* $OpenBSD: sshconnect.c,v 1.185 2006/06/14 10:50:42 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -385,10 +385,10 @@ ssh_exchange_identification(void)
int connection_in = packet_get_connection_in(); int connection_in = packet_get_connection_in();
int connection_out = packet_get_connection_out(); int connection_out = packet_get_connection_out();
int minor1 = PROTOCOL_MINOR_1; int minor1 = PROTOCOL_MINOR_1;
u_int i; u_int i, n;
/* Read other side's version identification. */ /* Read other side's version identification. */
for (;;) { for (n = 0;;) {
for (i = 0; i < sizeof(buf) - 1; i++) { for (i = 0; i < sizeof(buf) - 1; i++) {
size_t len = atomicio(read, connection_in, &buf[i], 1); size_t len = atomicio(read, connection_in, &buf[i], 1);
@ -405,6 +405,8 @@ ssh_exchange_identification(void)
buf[i + 1] = 0; buf[i + 1] = 0;
break; break;
} }
if (++n > 65536)
fatal("ssh_exchange_identification: No banner received");
} }
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
if (strncmp(buf, "SSH-", 4) == 0) if (strncmp(buf, "SSH-", 4) == 0)