- markus@cvs.openbsd.org 2001/02/12 23:26:20

    [sshd.c]
    missing memset; from solar@openwall.com

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4827a8a3c..3df246d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
   - markus@cvs.openssh.org 2001/02/13 22:49:40
     [auth1.c auth2.c]
     setproctitle(user) only if getpwnam succeeds
+  - markus@cvs.openbsd.org 2001/02/12 23:26:20
+    [sshd.c]
+    missing memset; from solar@openwall.com
 
 20010214
  - (djm) Don't try to close PAM session or delete credentials if the
@@ -3954,4 +3957,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.766 2001/02/15 03:14:11 mouring Exp $
+$Id: ChangeLog,v 1.767 2001/02/15 03:17:13 mouring Exp $
diff --git a/sshd.c b/sshd.c
index dd8f6d83d..86bfb6519 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.166 2001/02/11 12:59:25 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.167 2001/02/12 23:26:20 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -324,7 +324,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
                         fatal_cleanup();
                 }
 
-                /* Read other side\'s version identification. */
+                /* Read other side's version identification. */
+                memset(buf, 0, sizeof(buf)); 
                 for (i = 0; i < sizeof(buf) - 1; i++) {
                         if (atomicio(read, sock_in, &buf[i], 1) != 1) {
                                 log("Did not receive ident string from %s.", get_remote_ipaddr());