036585a911
FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
147 lines
4.5 KiB
C
147 lines
4.5 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 (14 kb)"
|
|
//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 (15 kb)"
|
|
//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_NOEXEC(cryptpw, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw))
|
|
// APPLET_NOEXEC:name main location suid_type help
|
|
//applet:IF_MKPASSWD(APPLET_NOEXEC(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: "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" */
|
|
//usage: "\n -m,--method TYPE "CRYPT_METHODS_HELP_STR
|
|
//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 "CRYPT_METHODS_HELP_STR
|
|
//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
|
|
chosen 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)
|
|
{
|
|
/* 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;
|
|
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"
|
|
;
|
|
#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";
|
|
getopt32long(argv, "sP:+S:m:a:", mkpasswd_longopts,
|
|
&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)
|
|
/* put user's data after the "$N$" prefix */
|
|
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;
|
|
}
|