jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MFH (r272830): change the hardcoded default back to DES

Browse Source 
MFH (r272833): remove last vestige of MD5 password hashes
This commit is contained in:
Dag-Erling Smørgrav 2014-10-13 15:56:47 +00:00
parent 6a3fc79940
commit de10a62a9e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=273043
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libcrypt/crypt.c
View File

@ -37,24 +37,26 @@ __FBSDID("$FreeBSD$");
#include "crypt.h"
/*
* List of supported crypt(3) formats. The first element in the list will
* be the default.
* List of supported crypt(3) formats.
*
* The default algorithm is the last entry in the list (second-to-last
* array element since the last is a sentinel). The reason for placing
* the default last rather than first is that DES needs to be at the
* bottom for the algorithm guessing logic in crypt(3) to work correctly,
* and it needs to be the default for backward compatibility.
*/
static const struct crypt_format {
const char *const name;
char *(*const func)(const char *, const char *);
const char *const magic;
} crypt_formats[] = {
/* default format */
{ "sha512", crypt_sha512, "$6$" },
/* other supported formats */
{ "md5", crypt_md5, "$1$" },
#ifdef HAS_BLOWFISH
{ "blf", crypt_blowfish, "$2" },
#endif
{ "nth", crypt_nthash, "$3$" },
{ "sha256", crypt_sha256, "$5$" },
{ "sha512", crypt_sha512, "$6$" },
#ifdef HAS_DES
{ "des", crypt_des, "_" },
#endif
@ -63,7 +65,8 @@ static const struct crypt_format {
{ NULL, NULL, NULL }
};
static const struct crypt_format *crypt_format = &crypt_formats[0];
static const struct crypt_format *crypt_format =
&crypt_formats[(sizeof crypt_formats / sizeof *crypt_formats) - 2];
#define DES_SALT_ALPHABET \
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"

4
usr.sbin/pw/pw_user.c
View File

@ -615,7 +615,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
pwd->pw_dir = pw_homepolicy(cnf, args, pwd->pw_name);
pwd->pw_shell = pw_shellpolicy(cnf, args, NULL);
lc = login_getpwclass(pwd);
if (lc == NULL || login_setcryptfmt(lc, "md5", NULL) == NULL)
if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
@ -690,7 +690,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
} else {
lc = login_getpwclass(pwd);
if (lc == NULL ||
login_setcryptfmt(lc, "md5", NULL) == NULL)
login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_pwcrypt(line);