summaryrefslogtreecommitdiff
path: root/docs/modular_crypt_format.rst
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-06-02 17:35:19 -0400
committerEli Collins <elic@assurancetechnologies.com>2011-06-02 17:35:19 -0400
commit0b9e148d3605fca14138813f5f679e2c387d8966 (patch)
tree61a89170a1d3e08717fb450b7483073d003218b4 /docs/modular_crypt_format.rst
parenteb2f1f39989134a64c3059f7fbd5329c81a3ad51 (diff)
downloadpasslib-0b9e148d3605fca14138813f5f679e2c387d8966.tar.gz
added support for Cryptacular's PBKDF2 format
Diffstat (limited to 'docs/modular_crypt_format.rst')
-rw-r--r--docs/modular_crypt_format.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/modular_crypt_format.rst b/docs/modular_crypt_format.rst
index f22a8d9..3db7c6a 100644
--- a/docs/modular_crypt_format.rst
+++ b/docs/modular_crypt_format.rst
@@ -150,5 +150,13 @@ Scheme Prefix Known Uses
:class:`~passlib.hash.pbkdf2_sha1` ``$pbkdf2$``
:class:`~passlib.hash.pbkdf2_sha256` ``$pbkdf2-sha256$``
:class:`~passlib.hash.pbkdf2_sha512` ``$pbkdf2-sha512$``
+:class:`~passlib.hash.cta_pbkdf2_sha1` ``$p5k2$``
:class:`~passlib.hash.dlitz_pbkdf2_sha1` ``$p5k2$``
=========================================== =================== ===========================
+
+.. note::
+ :class:`!cta_pbkdf2_sha1` and :class:`!dlitz_pbkdf2_sha1` both use
+ the same identifier. They can be distinguished
+ by the fact that cta hashes will always end in ``=``, while dlitz
+ hashes contain no ``=`` at all.
+ \ No newline at end of file