Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/loginutils/cryptpw.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -10 +10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//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:    )
+
+/* 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(
+//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"
@@ -54 +91 @@
 int cryptpw_main(int argc UNUSED_PARAM, char **argv)
 {
-    /* $N$ + sha_salt_16_bytes + NUL */
-    char salt[3 + 16 + 1];
+    char salt[MAX_PW_SALT_LEN];
     char *salt_ptr;
     const char *opt_m, *opt_S;
-    int len;
     int fd;
 
@@ -71 +106 @@
 #endif
     fd = STDIN_FILENO;
-    opt_m = "d";
+    opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
     opt_S = NULL;
     /* at most two non-option arguments; -P NUM */
@@ -83 +118 @@
         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
-    }
+    salt_ptr = crypt_make_pw_salt(salt, opt_m);
     if (opt_S)
-        safe_strncpy(salt_ptr, opt_S, sizeof(salt) - 3);
-    else
-        crypt_make_salt(salt_ptr, len, 0);
+        safe_strncpy(salt_ptr, opt_S, sizeof(salt) - (sizeof("$N$")-1));
 
     xmove_fd(fd, STDIN_FILENO);