summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorPascal Bach2015-12-18 19:01:14 +0100
committerDenys Vlasenko2015-12-18 19:01:14 +0100
commit2c0d3f5fd08ccc6963c402030efcbe8a2c028f2d (patch)
tree2b0429a21288e621a9195cd05fd96a422346bfbe /libbb
parentb50525124228b566ccfd5c6df0647988bb2d2d3a (diff)
downloadbusybox-2c0d3f5fd08ccc6963c402030efcbe8a2c028f2d.zip
busybox-2c0d3f5fd08ccc6963c402030efcbe8a2c028f2d.tar.gz
chpasswd: support -c argument and respect DEFAULT_PASSWD_ALGO
Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/pw_encrypt.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index bfc7030..dbc15e5 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -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