summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-06-04 01:16:31 -0400
committerEli Collins <elic@assurancetechnologies.com>2011-06-04 01:16:31 -0400
commita2503c90bee6431668b041dcd9c09c6296605b7f (patch)
treeeb166d5f270501d98c7e0a9e60d2c4a6005773ff
parent72edc4db75771aa1be6cad322f86d3a486b33898 (diff)
downloadpasslib-a2503c90bee6431668b041dcd9c09c6296605b7f.tar.gz
updated note about Roundup support
-rw-r--r--docs/lib/passlib.apps.rst15
1 files changed, 5 insertions, 10 deletions
diff --git a/docs/lib/passlib.apps.rst b/docs/lib/passlib.apps.rst
index 913d903..833ca93 100644
--- a/docs/lib/passlib.apps.rst
+++ b/docs/lib/passlib.apps.rst
@@ -149,22 +149,17 @@ The following contexts are available for reading Roundup password hash fields:
.. data:: roundup10_context
- This object should recognize all password hashes used by Roundup:
+ This object should recognize all password hashes used by Roundup 1.4.16 and earlier:
:class:`~passlib.hash.ldap_hex_sha1` (the default),
:class:`~passlib.hash.ldap_hex_md5`, :class:`~passlib.hash.ldap_des_crypt`,
and :class:`~passlib.hash.roundup_plaintext`.
.. data:: roundup15_context
- As of 2011-04-28, the next release of Roundup will add support
- for :class:`~passlib.hash.ldap_pbkdf2_sha1`. This context supports
- all the :data:`roundup10_context` hashes, but adds this hash as well
- (and uses it as the default).
-
- .. note::
-
- This version of Roundup has not been released yet,
- databases using Roundup 1.4.16 and earlier should use the :data:`roundup10_context` instead.
+ Roundup 1.4.17 adds support for :class:`~passlib.hash.ldap_pbkdf2_sha1`
+ as it's preferred hash format.
+ This context supports all the :data:`roundup10_context` hashes,
+ but adds that hash as well (and uses it as the default).
.. data:: roundup_context