diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-12-08 14:06:16 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-12-08 14:06:16 +0000 |
| commit | 542f66501b547cc8a03908323e891a31b6f2a6f5 (patch) | |
| tree | 35e877a1c3fe66b80e5d3ed3295bb352fb98c2d3 /support/htpasswd.c | |
| parent | 7bb1b3dbd6e7872ca49c9c6f47a35a6114828c45 (diff) | |
| download | httpd-542f66501b547cc8a03908323e891a31b6f2a6f5.tar.gz | |
Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.
What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.
Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>
Reviewed by: ylavic
Github: closes #153
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884207 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htpasswd.c')
| -rw-r--r-- | support/htpasswd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/support/htpasswd.c b/support/htpasswd.c index f17d9923e1..2bb6d08247 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -108,17 +108,17 @@ static void usage(void) " -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 (secure)." NL - " -5 Force SHA-512 crypt() hash of the password (secure)." NL - " -B Force bcrypt encryption of the password (very secure)." NL + " -m Force MD5 hashing of the password (default)." NL + " -2 Force SHA-256 hashing of the password (secure)." NL + " -5 Force SHA-512 hashing of the password (secure)." NL + " -B Force bcrypt hashing 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 " -r Set the number of rounds used for the SHA-256, SHA-512 algorithms" NL " (higher is more secure but slower, default: 5000)." NL - " -d Force CRYPT encryption of the password (8 chars max, insecure)." NL - " -s Force SHA-1 encryption of the password (insecure)." NL - " -p Do not encrypt the password (plaintext, insecure)." NL + " -d Force CRYPT hashing of the password (8 chars max, insecure)." NL + " -s Force SHA-1 hashing of the password (insecure)." NL + " -p Do not hash the password (plaintext, insecure)." NL " -D Delete the specified user." NL " -v Verify password for the specified user." NL "On other systems than Windows and NetWare the '-p' flag will " |