mirror of
https://github.com/sheumann/hush.git
synced 2024-08-14 11:28:58 +00:00
In many cases, this aqllows to drop use of opt_complementary. Approximately -400 bytes: function old new delta getopt32 1423 1502 +79 opt_string 17 18 +1 OPT_STR 24 25 +1 uniq_main 416 406 -10 timeout_main 279 269 -10 sulogin_main 270 260 -10 readprofile_main 1825 1815 -10 ps_main 543 533 -10 pidof_main 245 235 -10 pgrep_main 611 601 -10 od_main 2600 2590 -10 mkfs_minix_main 2684 2674 -10 mkfs_ext2_main 2603 2593 -10 microcom_main 712 702 -10 makemime_main 315 305 -10 ionice_main 282 272 -10 inetd_main 2074 2064 -10 ifplugd_main 1144 1134 -10 halt_main 353 343 -10 getopt_main 636 626 -10 fdisk_main 2854 2844 -10 env_main 206 196 -10 dmesg_main 319 309 -10 conspy_main 1214 1204 -10 awk_main 981 971 -10 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes text data bss dec hex filename 919373 906 14060 934339 e41c3 busybox_old 918969 906 14060 933935 e402f busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
145 lines
4.4 KiB
C
145 lines
4.4 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* cryptpw.c - output a crypt(3)ed password to stdout.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*
|
|
* Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no>
|
|
* mkpasswd compatible options added by Bernhard Reutner-Fischer
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config CRYPTPW
|
|
//config: bool "cryptpw"
|
|
//config: default y
|
|
//config: help
|
|
//config: Encrypts the given password with the crypt(3) libc function
|
|
//config: using the given salt.
|
|
//config:
|
|
//config:config MKPASSWD
|
|
//config: bool "mkpasswd"
|
|
//config: default y
|
|
//config: help
|
|
//config: Encrypts the given password with the crypt(3) libc function
|
|
//config: using the given salt. Debian has this utility under mkpasswd
|
|
//config: name. Busybox provides mkpasswd as an alias for cryptpw.
|
|
|
|
//applet:IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
// APPLET_ODDNAME:name main location suid_type help
|
|
//applet:IF_MKPASSWD(APPLET_ODDNAME(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw))
|
|
|
|
//kbuild:lib-$(CONFIG_CRYPTPW) += cryptpw.o
|
|
//kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o
|
|
|
|
//usage:#define cryptpw_trivial_usage
|
|
//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: IF_LONG_OPTS(
|
|
//usage: "\n -P,--password-fd=N Read password from fd N"
|
|
/* //usage: "\n -s,--stdin Use stdin; like -P0" */
|
|
//usage: "\n -m,--method=TYPE Encryption method"
|
|
//usage: "\n -S,--salt=SALT"
|
|
//usage: )
|
|
//usage: IF_NOT_LONG_OPTS(
|
|
//usage: "\n -P N Read password from fd N"
|
|
/* //usage: "\n -s Use stdin; like -P0" */
|
|
//usage: "\n -m TYPE Encryption method TYPE"
|
|
//usage: "\n -S SALT"
|
|
//usage: )
|
|
|
|
#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)
|
|
{
|
|
char salt[MAX_PW_SALT_LEN];
|
|
char *salt_ptr;
|
|
char *password;
|
|
const char *opt_m, *opt_S;
|
|
int fd;
|
|
|
|
#if ENABLE_LONG_OPTS
|
|
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 = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
|
|
opt_S = NULL;
|
|
/* at most two non-option arguments; -P NUM */
|
|
opt_complementary = "?2";
|
|
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];
|
|
|
|
salt_ptr = crypt_make_pw_salt(salt, opt_m);
|
|
if (opt_S)
|
|
safe_strncpy(salt_ptr, opt_S, sizeof(salt) - (sizeof("$N$")-1));
|
|
|
|
xmove_fd(fd, STDIN_FILENO);
|
|
|
|
password = argv[0];
|
|
if (!password) {
|
|
/* Only mkpasswd, and only from tty, prompts.
|
|
* Otherwise it is a plain read. */
|
|
password = (ENABLE_MKPASSWD && isatty(STDIN_FILENO) && applet_name[0] == 'm')
|
|
? bb_ask_stdin("Password: ")
|
|
: xmalloc_fgetline(stdin)
|
|
;
|
|
/* may still be NULL on EOF/error */
|
|
}
|
|
|
|
if (password)
|
|
puts(pw_encrypt(password, salt, 1));
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|