diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-15 21:48:31 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-15 21:48:31 +0100 |
| commit | 6c73aaff38819533c55aecc53487d53521915e91 (patch) | |
| tree | 0d2c0f0893420f61101d9501303c6e0e0165113c /loginutils | |
| parent | 16e7f697f8064a4e5fc2f8e181fe6a7b9602b1b3 (diff) | |
| download | busybox-6c73aaff38819533c55aecc53487d53521915e91.tar.gz | |
cryptpw: support "rounds=NNNNNNN$" thing in salts
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/cryptpw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 9f5f40686..d630231c6 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -35,7 +35,7 @@ //usage: "[OPTIONS] [PASSWORD] [SALT]" /* We do support -s, we just don't mention it */ //usage:#define cryptpw_full_usage "\n\n" -//usage: "Crypt PASSWORD using crypt(3)\n" +//usage: "Print crypt(3) hashed PASSWORD\n" //usage: IF_LONG_OPTS( //usage: "\n -P,--password-fd=N Read password from fd N" /* //usage: "\n -s,--stdin Use stdin; like -P0" */ @@ -92,7 +92,8 @@ to cryptpw. -a option (alias for -m) came from cryptpw. int cryptpw_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int cryptpw_main(int argc UNUSED_PARAM, char **argv) { - char salt[MAX_PW_SALT_LEN]; + /* Supports: cryptpw -m sha256 PASS 'rounds=999999999$SALT' */ + char salt[MAX_PW_SALT_LEN + sizeof("rounds=999999999$")]; char *salt_ptr; char *password; const char *opt_m, *opt_S; @@ -122,6 +123,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) salt_ptr = crypt_make_pw_salt(salt, opt_m); if (opt_S) + /* put user's data after the "$N$" prefix */ safe_strncpy(salt_ptr, opt_S, sizeof(salt) - (sizeof("$N$")-1)); xmove_fd(fd, STDIN_FILENO); |