1 files changed, 14 insertions, 5 deletions

diff --git a/auth-passwd.c b/auth-passwd.c
index 63ccf3cab..996c2cf71 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-passwd.c,v 1.44 2014/07/15 15:54:14 millert Exp $ */
+/* $OpenBSD: auth-passwd.c,v 1.45 2016/07/21 01:39:35 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -66,6 +66,8 @@ extern login_cap_t *lc;
 #define DAY             (24L * 60 * 60) /* 1 day in seconds */
 #define TWO_WEEKS       (2L * 7 * DAY)  /* 2 weeks in seconds */
 
+#define MAX_PASSWORD_LEN        1024
+
 void
 disable_forwarding(void)
 {
@@ -87,6 +89,9 @@ auth_password(Authctxt *authctxt, const char *password)
         static int expire_checked = 0;
 #endif
 
+        if (strlen(password) > MAX_PASSWORD_LEN)
+                return 0;
+
 #ifndef HAVE_CYGWIN
         if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                 ok = 0;
@@ -193,7 +198,7 @@ int
 sys_auth_passwd(Authctxt *authctxt, const char *password)
 {
         struct passwd *pw = authctxt->pw;
-        char *encrypted_password;
+        char *encrypted_password, *salt = NULL;
 
         /* Just use the supplied fake password if authctxt is invalid */
         char *pw_password = authctxt->valid ? shadow_pw(pw) : pw->pw_passwd;
@@ -202,9 +207,13 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
         if (strcmp(pw_password, "") == 0 && strcmp(password, "") == 0)
                 return (1);
 
-        /* Encrypt the candidate password using the proper salt. */
-        encrypted_password = xcrypt(password,
-            (pw_password[0] && pw_password[1]) ? pw_password : "xx");
+        /*
+         * Encrypt the candidate password using the proper salt, or pass a
+         * NULL and let xcrypt pick one.
+         */
+        if (authctxt->valid && pw_password[0] && pw_password[1])
+                salt = pw_password;
+        encrypted_password = xcrypt(password, salt);
 
         /*
          * Authentication is accepted if the encrypted passwords