summaryrefslogtreecommitdiff
path: root/docs/lib
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2015-07-25 14:33:41 -0400
committerEli Collins <elic@assurancetechnologies.com>2015-07-25 14:33:41 -0400
commita16500cdb9cc27c68a4c8f349f5f67a2f4ee355f (patch)
treebf6f07d9e69b02409f1723d74ea1655aea934301 /docs/lib
parentafea4e0e507cca61676911e9f2712703cd135ee4 (diff)
parent80f093c922b64dfaedd00194a2fe16648fe2a8d0 (diff)
downloadpasslib-a16500cdb9cc27c68a4c8f349f5f67a2f4ee355f.tar.gz
Merge from stable
Diffstat (limited to 'docs/lib')
-rw-r--r--docs/lib/passlib.hash.bcrypt.rst4
-rw-r--r--docs/lib/passlib.hash.cisco_pix.rst6
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/lib/passlib.hash.bcrypt.rst b/docs/lib/passlib.hash.bcrypt.rst
index 55566fa..53a841a 100644
--- a/docs/lib/passlib.hash.bcrypt.rst
+++ b/docs/lib/passlib.hash.bcrypt.rst
@@ -179,8 +179,8 @@ This implementation of bcrypt differs from others in a few ways:
.. versionchanged:: 1.6.3
- Passlib will now detect, and refuse to use, any backend which is vulnerable
- to this bug.
+ Passlib will now throw a :exc:`~passlib.exc.PasslibSecurityError` if an attempt is
+ made to use any backend which is vulnerable to this bug.
* The 'BSD wraparound' bug
diff --git a/docs/lib/passlib.hash.cisco_pix.rst b/docs/lib/passlib.hash.cisco_pix.rst
index 7c53217..bb29d68 100644
--- a/docs/lib/passlib.hash.cisco_pix.rst
+++ b/docs/lib/passlib.hash.cisco_pix.rst
@@ -19,6 +19,12 @@
In the mean time, there are no guarantees that its behavior correctly replicates
the official implementation. *caveat emptor*.
+.. warning::
+
+ This class does not correctly handle hashes generated by
+ Pix/ASA 7.0 (2005) or newer; particularly for passwords 13 characters or more
+ (:issue:`51`). A new :class:`!cisco_asa` will be added in Passlib 1.7 to support these hashes.
+
.. currentmodule:: passlib.hash
The :class:`cisco_pix` class implements the password hash algorithm commonly found on older Cisco