mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-27 23:53:26 +08:00
- deraadt@cvs.openbsd.org 2001/03/22 20:22:55
[sshd.c] do not place linefeeds in buffer
This commit is contained in:
parent
d9267454ca
commit
69d8c077d4
@ -1,3 +1,9 @@
|
||||
20010323
|
||||
- OpenBSD CVS Sync
|
||||
- deraadt@cvs.openbsd.org 2001/03/22 20:22:55
|
||||
[sshd.c]
|
||||
do not place linefeeds in buffer
|
||||
|
||||
20010322
|
||||
- (djm) Better AIX no tty fix, spotted by Gert Doering <gert@greenie.muc.de>
|
||||
- (bal) version.c CVS ID resync
|
||||
@ -4682,4 +4688,4 @@
|
||||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1008 2001/03/22 02:06:57 mouring Exp $
|
||||
$Id: ChangeLog,v 1.1009 2001/03/22 22:45:33 mouring Exp $
|
||||
|
9
sshd.c
9
sshd.c
@ -40,7 +40,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshd.c,v 1.175 2001/03/18 23:30:55 deraadt Exp $");
|
||||
RCSID("$OpenBSD: sshd.c,v 1.176 2001/03/22 20:22:55 deraadt Exp $");
|
||||
|
||||
#include <openssl/dh.h>
|
||||
#include <openssl/bn.h>
|
||||
@ -344,8 +344,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
||||
fatal_cleanup();
|
||||
}
|
||||
if (buf[i] == '\r') {
|
||||
buf[i] = '\n';
|
||||
buf[i + 1] = 0;
|
||||
buf[i] = 0;
|
||||
/* Kludge for F-Secure Macintosh < 1.0.2 */
|
||||
if (i == 12 &&
|
||||
strncmp(buf, "SSH-1.5-W1.0", 12) == 0)
|
||||
@ -353,8 +352,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
||||
continue;
|
||||
}
|
||||
if (buf[i] == '\n') {
|
||||
/* buf[i] == '\n' */
|
||||
buf[i + 1] = 0;
|
||||
buf[i] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -420,7 +418,6 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
||||
break;
|
||||
}
|
||||
chop(server_version_string);
|
||||
chop(client_version_string);
|
||||
debug("Local version string %.200s", server_version_string);
|
||||
|
||||
if (mismatch) {
|
||||
|
Loading…
Reference in New Issue
Block a user