[src/trunk]: src/crypto/external/bsd/openssh/dist restore default xx salt.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/575fc7797e82
branches:  trunk
changeset: 321818:575fc7797e82
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 07 00:26:12 2018 +0000

description:
restore default xx salt.

diffstat:

 crypto/external/bsd/openssh/dist/auth-passwd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5a89a66dd19e -r 575fc7797e82 crypto/external/bsd/openssh/dist/auth-passwd.c
--- a/crypto/external/bsd/openssh/dist/auth-passwd.c    Sat Apr 07 00:22:27 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-passwd.c    Sat Apr 07 00:26:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-passwd.c,v 1.8 2018/04/06 18:58:59 christos Exp $ */
+/*     $NetBSD: auth-passwd.c,v 1.9 2018/04/07 00:26:12 christos Exp $ */
 /* $OpenBSD: auth-passwd.c,v 1.46 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -38,7 +38,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-passwd.c,v 1.8 2018/04/06 18:58:59 christos Exp $");
+__RCSID("$NetBSD: auth-passwd.c,v 1.9 2018/04/07 00:26:12 christos Exp $");
 #include <sys/types.h>
 
 #include <login_cap.h>
@@ -189,7 +189,7 @@
         */
        if (authctxt->valid && pw_password[0] && pw_password[1])
                salt = pw_password;
-       encrypted_password = xcrypt(password, salt);
+       encrypted_password = xcrypt(password, salt ? salt : "xx");
 
        /*
         * Authentication is accepted if the encrypted passwords