Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/cryptpw.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/cryptpw.c (modified) (4 diffs)

branches/3.3/mindi-busybox/loginutils/cryptpw.c

@@ -10 +10 @@
  * 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
@@ -15 +36 @@
 /* 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:    )
-
-/* mkpasswd is an alias to cryptpw */
-//usage:#define mkpasswd_trivial_usage
-//usage:       "[OPTIONS] [PASSWORD] [SALT]"
-/* We do support -s, we just don't mention it */
-//usage:#define mkpasswd_full_usage "\n\n"
 //usage:       "Crypt PASSWORD using crypt(3)\n"
 //usage:    IF_LONG_OPTS(
@@ -93 +95 @@
     char salt[MAX_PW_SALT_LEN];
     char *salt_ptr;
+    char *password;
     const char *opt_m, *opt_S;
     int fd;
@@ -124 +127 @@
     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(STDIN_FILENO) && applet_name[0] == 'm')
+    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)
-        ),
-        salt, 1));
+        ;
+        /* may still be NULL on EOF/error */
+    }
+
+    if (password)
+        puts(pw_encrypt(password, salt, 1));
 
     return EXIT_SUCCESS;