Spelling fixes in comments, documentation, tests and examples

[oweals/busybox.git] / loginutils / cryptpw.c

diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 9f5f406860357c672c52713ed200e51b5ae6cb8b..3dc8232e0015620fdf3422e35f55e1391ffcf505 100644 (file)
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -35,17 +35,17 @@
 //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:       "Print crypt(3) hashed PASSWORD\n"
 //usage:       IF_LONG_OPTS(
-//usage:     "\n       -P,--password-fd=N      Read password from fd N"
+//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:     "\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 Encryption method TYPE"
+//usage:     "\n       -m TYPE "CRYPT_METHODS_HELP_STR
 //usage:     "\n       -S SALT"
 //usage:       )
 
@@ -64,7 +64,7 @@ OPTIONS
     $1$.
 -R, --rounds=NUMBER
     Use NUMBER rounds. This argument is ignored if the method
-    choosen does not support variable rounds. For the OpenBSD Blowfish
+    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'
@@ -92,7 +92,8 @@ 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];
+       /* 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;
@@ -122,6 +123,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
 
        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);