mirror of
https://github.com/sheumann/hush.git
synced 2024-09-01 05:29:31 +00:00
e45930e890
mkpasswd is in Debian, OTOH cryptpw was added to busybox earlier. Trying to make both camps happy by making those two applets just aliases. They are command-line compatible. We can decide whether we want to drop one (and which one) later. function old new delta cryptpw_main 183 314 +131 static.methods 21 - -21 packed_usage 25707 25648 -59 mkpasswd_main 307 - -307 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 1/1 up/down: 131/-387) Total: -256 bytes
114 lines
2.9 KiB
C
114 lines
2.9 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* cryptpw.c
|
|
*
|
|
* Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no>
|
|
* mkpasswd compatible options added by Bernhard Reutner-Fischer
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
/* Debian has 'mkpasswd' utility, manpage says:
|
|
|
|
NAME
|
|
mkpasswd - Overfeatured front end to crypt(3)
|
|
SYNOPSIS
|
|
mkpasswd PASSWORD SALT
|
|
...
|
|
OPTIONS
|
|
-S, --salt=STRING
|
|
Use the STRING as salt. It must not contain prefixes such as
|
|
$1$.
|
|
-R, --rounds=NUMBER
|
|
Use NUMBER rounds. This argument is ignored if the method
|
|
choosen does not support variable rounds. For the OpenBSD Blowfish
|
|
method this is the logarithm of the number of rounds.
|
|
-m, --method=TYPE
|
|
Compute the password using the TYPE method. If TYPE is 'help'
|
|
then the available methods are printed.
|
|
-P, --password-fd=NUM
|
|
Read the password from file descriptor NUM instead of using getpass(3).
|
|
If the file descriptor is not connected to a tty then
|
|
no other message than the hashed password is printed on stdout.
|
|
-s, --stdin
|
|
Like --password-fd=0.
|
|
ENVIRONMENT
|
|
$MKPASSWD_OPTIONS
|
|
A list of options which will be evaluated before the ones
|
|
specified on the command line.
|
|
BUGS
|
|
This programs suffers of a bad case of featuritis.
|
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
Very true...
|
|
|
|
cryptpw was in bbox before this gem, so we retain it, and alias mkpasswd
|
|
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)
|
|
{
|
|
/* $N$ + sha_salt_16_bytes + NUL */
|
|
char salt[3 + 16 + 1];
|
|
char *salt_ptr;
|
|
const char *opt_m, *opt_S;
|
|
int len;
|
|
int fd;
|
|
|
|
#if ENABLE_GETOPT_LONG
|
|
static const char mkpasswd_longopts[] ALIGN1 =
|
|
"stdin\0" No_argument "s"
|
|
"password-fd\0" Required_argument "P"
|
|
"salt\0" Required_argument "S"
|
|
"method\0" Required_argument "m"
|
|
;
|
|
applet_long_options = mkpasswd_longopts;
|
|
#endif
|
|
fd = STDIN_FILENO;
|
|
opt_m = "d";
|
|
opt_S = NULL;
|
|
/* at most two non-option arguments; -P NUM */
|
|
opt_complementary = "?2:P+";
|
|
getopt32(argv, "sP:S:m:a:", &fd, &opt_S, &opt_m, &opt_m);
|
|
argv += optind;
|
|
|
|
/* have no idea how to handle -s... */
|
|
|
|
if (argv[0] && !opt_S)
|
|
opt_S = argv[1];
|
|
|
|
len = 2/2;
|
|
salt_ptr = salt;
|
|
if (opt_m[0] != '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 (opt_m[0] == 's') { /* sha */
|
|
salt[1] = '5' + (strcmp(opt_m, "sha512") == 0);
|
|
len = 16/2;
|
|
}
|
|
#endif
|
|
}
|
|
if (opt_S)
|
|
safe_strncpy(salt_ptr, opt_S, sizeof(salt) - 3);
|
|
else
|
|
crypt_make_salt(salt_ptr, len, 0);
|
|
|
|
xmove_fd(fd, STDIN_FILENO);
|
|
|
|
puts(pw_encrypt(
|
|
argv[0] ? argv[0] : (
|
|
/* Only mkpasswd, and only from tty, prompts.
|
|
* Otherwise it is a plain read. */
|
|
(isatty(0) && applet_name[0] == 'm')
|
|
? bb_ask(STDIN_FILENO, 0, "Password: ")
|
|
: xmalloc_fgetline(stdin)
|
|
),
|
|
salt, 1));
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|