summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2013-07-06 23:40:00 +0200
committerStefan Fritsch <sf@apache.org>2013-07-06 23:40:00 +0200
commit935f44c6964cc1fe8cf98f755938200aefed3fc6 (patch)
tree5621c70202f71a3417218b8f42733745788c1bd2 /docs
parentUpdates. (diff)
downloadapache2-935f44c6964cc1fe8cf98f755938200aefed3fc6.tar.xz
apache2-935f44c6964cc1fe8cf98f755938200aefed3fc6.zip
add note when default algorithm has been changed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500323 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/programs/htpasswd.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml
index b452f4f5e7..e5a6af95e5 100644
--- a/docs/manual/programs/htpasswd.xml
+++ b/docs/manual/programs/htpasswd.xml
@@ -126,7 +126,8 @@ distribution.</seealso>
one) is omitted. It cannot be combined with the <code>-c</code> option.</dd>
<dt><code>-m</code></dt>
- <dd>Use MD5 encryption for passwords. This is the default.</dd>
+ <dd>Use MD5 encryption for passwords. This is the default (since version
+ 2.2.18).</dd>
<dt><code>-B</code></dt>
<dd>Use bcrypt encryption for passwords. This is currently considered to
@@ -141,7 +142,8 @@ distribution.</seealso>
<dd>Use <code>crypt()</code> encryption for passwords. This is not
supported by the <program>httpd</program> server on Windows and
Netware. This algorithm limits the password length to 8 characters.
- This algorithm is <strong>insecure</strong> by today's standards.</dd>
+ This algorithm is <strong>insecure</strong> by today's standards.
+ It used to be the default algorithm until version 2.2.17.</dd>
<dt><code>-s</code></dt>
<dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape