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

Don't break the legacy applications which set

Browse Source 
just 2 bytes to salt.

MFC after:	1 week
This commit is contained in:
Hajimu UMEMOTO 2014-05-28 16:50:18 +00:00
parent 4272b84663
commit 0cb06892fa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=266813
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libcrypt/crypt.c
View File

@ -104,12 +104,16 @@ char *
crypt(const char *passwd, const char *salt)
{
const struct crypt_format *cf;
#ifdef HAS_DES
int len;
#endif
for (cf = crypt_formats; cf->name != NULL; ++cf)
if (cf->magic != NULL && strstr(salt, cf->magic) == salt)
return (cf->func(passwd, salt));
#ifdef HAS_DES
if (strlen(salt) == 13 && strspn(salt, DES_SALT_ALPHABET) == 13)
len = strlen(salt);
if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len)
return (crypt_des(passwd, salt));
#endif
return (crypt_format->func(passwd, salt));