diff options
| author | Joe Orton <jorton@apache.org> | 2019-07-08 10:39:53 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2019-07-08 10:39:53 +0200 |
| commit | 6a0832b2c829b47122bacd1bf1ea64b0d8ec3e2b (patch) | |
| tree | 6e819faf05bc0e44277e40783dc8e6fdee40d9c1 /support/htpasswd.c | |
| parent | Update transform. (diff) | |
| download | apache2-6a0832b2c829b47122bacd1bf1ea64b0d8ec3e2b.tar.xz apache2-6a0832b2c829b47122bacd1bf1ea64b0d8ec3e2b.zip | |
* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
as "secure", leave bcrypt only algorithm described as "very secure".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862724 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htpasswd.c')
| -rw-r--r-- | support/htpasswd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/support/htpasswd.c b/support/htpasswd.c index 7366dcb6e7..1d2c2c6621 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -98,19 +98,19 @@ static int mkrecord(struct passwd_ctx *ctx, char *user) static void usage(void) { apr_file_printf(errfile, "Usage:" NL - "\thtpasswd [-cimBdpsDv] [-C cost] passwordfile username" NL - "\thtpasswd -b[cmBdpsDv] [-C cost] passwordfile username password" NL + "\thtpasswd [-cimB25dpsDv] [-C cost] [-r rounds] passwordfile username" NL + "\thtpasswd -b[cmB25dpsDv] [-C cost] [-r rounds] passwordfile username password" NL NL - "\thtpasswd -n[imBdps] [-C cost] username" NL - "\thtpasswd -nb[mBdps] [-C cost] username password" NL + "\thtpasswd -n[imB25dps] [-C cost] [-r rounds] username" NL + "\thtpasswd -nb[mB25dps] [-C cost] [-r rounds] username password" NL " -c Create a new file." NL " -n Don't update file; display results on stdout." NL " -b Use the password from the command line rather than prompting " "for it." NL " -i Read password from stdin without verification (for script usage)." NL " -m Force MD5 encryption of the password (default)." NL - " -2 Force SHA-256 crypt() hash of the password (very secure)." NL - " -5 Force SHA-512 crypt() hash of the password (very secure)." NL + " -2 Force SHA-256 crypt() hash of the password (secure)." NL + " -5 Force SHA-512 crypt() hash of the password (secure)." NL " -B Force bcrypt aencryption of the password (very secure)." NL " -C Set the computing time used for the bcrypt algorithm" NL " (higher is more secure but slower, default: %d, valid: 4 to 17)." NL |