Module Name: src
Committed By: christos
Date: Sat Apr 7 00:26:12 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: auth-passwd.c
Log Message:
restore default xx salt.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/auth-passwd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth-passwd.c
diff -u src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.8 src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.9
--- src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.8 Fri Apr 6 14:58:59 2018
+++ src/crypto/external/bsd/openssh/dist/auth-passwd.c Fri Apr 6 20:26:12 2018
@@ -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 <[email protected]>
@@ -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 @@ sys_auth_passwd(struct ssh *ssh, const c
*/
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
