emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chpasswd: support -c argument and respect DEFAULT_PASSWD_ALGO

Browse Source 
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Pascal Bach
2015-12-18 19:01:14 +01:00
committed by Denys Vlasenko
parent b505251242
commit 2c0d3f5fd0
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libbb/pw_encrypt.c
View File

@@ -52,14 +52,18 @@ char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
{
int len = 2/2;
char *salt_ptr = salt;
if (algo[0] != 'd') { /* not des */
/* Standard chpasswd uses uppercase algos ("MD5", not "md5").
* Need to be case-insensitive in the code below.
*/
if ((algo[0]|0x20) != 'd') { /* not des */
len = 8/2; /* so far assuming md5 */
*salt_ptr++ = '$';
*salt_ptr++ = '1';
*salt_ptr++ = '$';
#if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
if (algo[0] == 's') { /* sha */
salt[1] = '5' + (strcmp(algo, "sha512") == 0);
if ((algo[0]|0x20) == 's') { /* sha */
salt[1] = '5' + (strcasecmp(algo, "sha512") == 0);
len = 16/2;
}
#endif