diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/pw_encrypt.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index bfc7030a8..dbc15e5fc 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) | |||
| 52 | { | 52 | { |
| 53 | int len = 2/2; | 53 | int len = 2/2; |
| 54 | char *salt_ptr = salt; | 54 | char *salt_ptr = salt; |
| 55 | if (algo[0] != 'd') { /* not des */ | 55 | |
| 56 | /* Standard chpasswd uses uppercase algos ("MD5", not "md5"). | ||
| 57 | * Need to be case-insensitive in the code below. | ||
| 58 | */ | ||
| 59 | if ((algo[0]|0x20) != 'd') { /* not des */ | ||
| 56 | len = 8/2; /* so far assuming md5 */ | 60 | len = 8/2; /* so far assuming md5 */ |
| 57 | *salt_ptr++ = '$'; | 61 | *salt_ptr++ = '$'; |
| 58 | *salt_ptr++ = '1'; | 62 | *salt_ptr++ = '1'; |
| 59 | *salt_ptr++ = '$'; | 63 | *salt_ptr++ = '$'; |
| 60 | #if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA | 64 | #if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA |
| 61 | if (algo[0] == 's') { /* sha */ | 65 | if ((algo[0]|0x20) == 's') { /* sha */ |
| 62 | salt[1] = '5' + (strcmp(algo, "sha512") == 0); | 66 | salt[1] = '5' + (strcasecmp(algo, "sha512") == 0); |
| 63 | len = 16/2; | 67 | len = 16/2; |
| 64 | } | 68 | } |
| 65 | #endif | 69 | #endif |