d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the hardcoded default back from SHA512 to DES.

Browse Source 
PR:		192277
MFC after:	3 days
This commit is contained in:
des 2014-10-09 16:45:11 +00:00
parent 4447a27145
commit 23d266ef76
1 changed files with 10 additions and 7 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"