summaryrefslogtreecommitdiff
path: root/docs/lib
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2013-12-20 23:42:21 -0500
committerEli Collins <elic@assurancetechnologies.com>2013-12-20 23:42:21 -0500
commitd48644569397bfe529bc05a68ecd21d031550fa6 (patch)
treeca79158f8a025139592d6df14cf293210210dab8 /docs/lib
parent4af9748bcaed1085a8c1e64c2370fa00fb244f11 (diff)
downloadpasslib-d48644569397bfe529bc05a68ecd21d031550fa6.tar.gz
added support for bcrypt library (issue 49),
also split bcrypt handler tests out into separate file for ease of testing
Diffstat (limited to 'docs/lib')
-rw-r--r--docs/lib/passlib.hash.bcrypt.rst16
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/lib/passlib.hash.bcrypt.rst b/docs/lib/passlib.hash.bcrypt.rst
index 6b68d4c..b94dfa8 100644
--- a/docs/lib/passlib.hash.bcrypt.rst
+++ b/docs/lib/passlib.hash.bcrypt.rst
@@ -31,7 +31,8 @@ for new applications. This class can be used directly as follows::
.. note::
It is strongly recommended that you install
- `py-bcrypt <http://code.google.com/p/py-bcrypt/>`_
+ `bcrypt <https://pypi.python.org/pypi/bcrypt>`_
+ or `py-bcrypt <https://pypi.python.org/pypi/py-bcrypt>`_
when using this hash.
.. seealso:: the generic :ref:`PasswordHash usage examples <password-hash-examples>`
@@ -47,20 +48,21 @@ Interface
.. note::
- This class will use the first available of four possible backends:
+ This class will use the first available of five possible backends:
- 1. `py-bcrypt <http://code.google.com/p/py-bcrypt/>`_, if installed.
- 2. `bcryptor <https://bitbucket.org/ares/bcryptor/overview>`_, if installed.
- 3. stdlib's :func:`crypt.crypt()`, if the host OS supports BCrypt
+ 1. `bcrypt <https://pypi.python.org/pypi/bcrypt>`_, if installed.
+ 2. `py-bcrypt <https://pypi.python.org/pypi/py-bcrypt>`_, if installed.
+ 3. `bcryptor <https://bitbucket.org/ares/bcryptor/overview>`_, if installed.
+ 4. stdlib's :func:`crypt.crypt()`, if the host OS supports BCrypt
(primarily BSD-derived systems).
- 4. A pure-python implementation of BCrypt, built into Passlib.
+ 5. A pure-python implementation of BCrypt, built into Passlib.
If no backends are available, :meth:`encrypt` and :meth:`verify`
will throw :exc:`~passlib.exc.MissingBackendError` when they are invoked.
You can check which backend is in use by calling :meth:`!bcrypt.get_backend()`.
.. warning::
- The pure-python backend (#4) is disabled by default!
+ The pure-python backend (#5) is disabled by default!
That backend is currently too slow to be usuable given the number of rounds required
for security. That said, if you have no other alternative and need to use it,