aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/key-derivation-functions.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-10-07 09:34:58 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-10-07 16:34:58 +0200
commitc3a3ed424a56433a804a5bb8a9341bf6569c53a3 (patch)
treeda579339c7fd450f97eafd13229698072023dac3 /docs/hazmat/primitives/key-derivation-functions.rst
parenta187c97fe50fd89b0825c0faeb44d1960965f25d (diff)
downloadcryptography-c3a3ed424a56433a804a5bb8a9341bf6569c53a3.tar.gz
cryptography-c3a3ed424a56433a804a5bb8a9341bf6569c53a3.tar.bz2
cryptography-c3a3ed424a56433a804a5bb8a9341bf6569c53a3.zip
Link to our implementation of scrypt, now that we have it (#3189)
Diffstat (limited to 'docs/hazmat/primitives/key-derivation-functions.rst')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 511708d6..dbca3a5b 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -34,7 +34,8 @@ Different KDFs are suitable for different tasks such as:
`PBKDF2`_ (Password Based Key Derivation Function 2) is typically used for
deriving a cryptographic key from a password. It may also be used for
- key storage, but an alternate key storage KDF such as `scrypt`_ is generally
+ key storage, but an alternate key storage KDF such as
+ :class:`~cryptography.hazmat.primitives.kdf.scrypt.Scrypt` is generally
considered a better solution.
This class conforms to the
@@ -899,7 +900,6 @@ Interface
.. _`SEC 1 v2.0`: http://www.secg.org/sec1-v2.pdf
.. _`Password Storage Cheat Sheet`: https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet
.. _`PBKDF2`: https://en.wikipedia.org/wiki/PBKDF2
-.. _`scrypt`: https://en.wikipedia.org/wiki/Scrypt
.. _`key stretching`: https://en.wikipedia.org/wiki/Key_stretching
.. _`HKDF`: https://en.wikipedia.org/wiki/HKDF
.. _`HKDF paper`: https://eprint.iacr.org/2010/264