2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ea6cc5368..e6bc60239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    problems on Solaris-derived PAMs.
  - (djm) Clean up PAM namespace. Suggested by Darren Moffat
    <Darren.Moffat@eng.sun.com>
+ - (bal) Sync w/ OpenSSH for new release
+   - markus@cvs.openbsd.org 2001/02/12 12:45:06
+     [sshconnect1.c]
+     fix xmalloc(0), ok dugsong@
 
 20010214
  - (djm) Don't try to close PAM session or delete credentials if the
@@ -3931,4 +3935,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.761 2001/02/15 00:51:32 djm Exp $
+$Id: ChangeLog,v 1.762 2001/02/15 02:36:46 mouring Exp $
diff --git a/sshconnect1.c b/sshconnect1.c
index 9d6ab3a6a..c82375a3d 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.25 2001/02/08 23:11:43 dugsong Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.26 2001/02/12 12:45:06 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -57,7 +57,7 @@ ssh1_put_password(char *password)
         int size;
         char *padded;
 
-        size = roundup(strlen(password), 32);
+        size = roundup(strlen(password) + 1, 32);
         padded = xmalloc(size);
         strlcpy(padded, password, size);
         packet_put_string(padded, size);