You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/25 13:38:19 UTC
svn commit: r1365528 - in /httpd/httpd/branches/2.4.x: ./ STATUS
docs/manual/programs/htpasswd.xml support/htpasswd.c
Author: jim
Date: Wed Jul 25 11:38:19 2012
New Revision: 1365528
URL: http://svn.apache.org/viewvc?rev=1365528&view=rev
Log:
* htpasswd: Note more prominently that SHA and crypt are insecure.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352910
2.4.x patch: trunk patch works
+1: rjung, humbedooh, jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml
httpd/httpd/branches/2.4.x/support/htpasswd.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1352910
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1365528&r1=1365527&r2=1365528&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jul 25 11:38:19 2012
@@ -110,12 +110,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+1: rjung, jorton, jim
rjung: sf: you applied it to trunk, care to vote?
- * htpasswd: Note more prominently that SHA and crypt are insecure.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352910
- 2.4.x patch: trunk patch works
- +1: rjung, humbedooh, jim
- rjung: sf: you applied it to trunk, care to vote?
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml?rev=1365528&r1=1365527&r2=1365528&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml Wed Jul 25 11:38:19 2012
@@ -108,11 +108,13 @@ distribution.</seealso>
<dt><code>-d</code></dt>
<dd>Use <code>crypt()</code> encryption for passwords. This is not
supported by the <program>httpd</program> server on Windows and
- Netware.</dd>
+ Netware. This algorithm limits the password length to 8 characters.
+ This algorithm is <strong>insecure</strong> by today's standards.</dd>
<dt><code>-s</code></dt>
<dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape
- servers using the LDAP Directory Interchange Format (ldif).</dd>
+ servers using the LDAP Directory Interchange Format (ldif).
+ This algorithm is <strong>insecure</strong> by today's standards.</dd>
<dt><code>-p</code></dt>
<dd>Use plaintext passwords. Though <code>htpasswd</code> will support
@@ -200,6 +202,9 @@ distribution.</seealso>
there is only one encrypted representation. The <code>crypt()</code> and
MD5 formats permute the representation by prepending a random salt string,
to make dictionary attacks against the passwords more difficult.</p>
+
+ <p>The SHA and <code>crypt()</code> formats are insecure by today's
+ standards.</p>
</section>
<section id="restrictions"><title>Restrictions</title>
Modified: httpd/httpd/branches/2.4.x/support/htpasswd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/htpasswd.c?rev=1365528&r1=1365527&r2=1365528&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/htpasswd.c (original)
+++ httpd/httpd/branches/2.4.x/support/htpasswd.c Wed Jul 25 11:38:19 2012
@@ -283,9 +283,10 @@ static void usage(void)
" (default)"
"." NL);
apr_file_printf(errfile, " -d Force CRYPT encryption of the password"
- "." NL);
+ " (8 chars max, insecure)." NL);
apr_file_printf(errfile, " -p Do not encrypt the password (plaintext)." NL);
- apr_file_printf(errfile, " -s Force SHA encryption of the password." NL);
+ apr_file_printf(errfile, " -s Force SHA encryption of the password"
+ " (insecure)." NL);
apr_file_printf(errfile, " -b Use the password from the command line "
"rather than prompting for it." NL);
apr_file_printf(errfile, " -D Delete the specified user." NL);