RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-08 18:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/03/04 18:30:23

Browse Source 
[ssh-keyscan.c]
     handle connection close during read of protocol version string.
     fixes erroneous "bad greeting".  ok markus@
This commit is contained in:
Ben Lindstrom 2002-03-05 01:54:52 +00:00
parent 05764b9286
commit 6b28c35a04
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -54,6 +54,10 @@
$OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add $OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add
missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c
files. ok markus@ files. ok markus@
- stevesk@cvs.openbsd.org 2002/03/04 18:30:23
[ssh-keyscan.c]
handle connection close during read of protocol version string.
fixes erroneous "bad greeting". ok markus@
20020226 20020226
- (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
@ -7785,4 +7789,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1904 2002/03/05 01:53:02 mouring Exp $ $Id: ChangeLog,v 1.1905 2002/03/05 01:54:52 mouring Exp $

7
ssh-keyscan.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keyscan.c,v 1.34 2002/02/22 12:20:34 markus Exp $"); RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp $");
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h> #include <sys/queue.h>
@ -511,6 +511,11 @@ congreet(int s)
conrecycle(s); conrecycle(s);
return; return;
} }
if (n == 0) {
error("%s: Connection closed by remote host", c->c_name);
conrecycle(s);
return;
}
if (*cp != '\n' && *cp != '\r') { if (*cp != '\n' && *cp != '\r') {
error("%s: bad greeting", c->c_name); error("%s: bad greeting", c->c_name);
confree(s); confree(s);