aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-29 13:56:25 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-29 13:56:25 -0600
commitc58b478530a93df90d0c612df259d1668cdd3f6b (patch)
treee74d03122f05d587a8c948ab12633105eb4faf81
parent6fb1a5a99d3742763961d907c9f297f89f2f0b91 (diff)
downloadcryptography-c58b478530a93df90d0c612df259d1668cdd3f6b.tar.gz
cryptography-c58b478530a93df90d0c612df259d1668cdd3f6b.tar.bz2
cryptography-c58b478530a93df90d0c612df259d1668cdd3f6b.zip
update docs re: PBKDF2HMAC iterations
-rw-r--r--docs/hazmat/backends/interfaces.rst4
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index ca3a5433..5b3e852a 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -163,7 +163,9 @@ A specific ``backend`` may provide one or more of these interfaces.
:param bytes salt: A salt.
:param int iterations: The number of iterations to perform of the hash
- function.
+ function. This can be used to control the length of time the
+ operation takes. Higher numbers help mitigate brute force attacks
+ against derived keys.
:param bytes key_material: The key material to use as a basis for
the derived key. This is typically a password.
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index e652ecbf..bf069faa 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -58,7 +58,9 @@ key stretching) so match your needs to their capabilities.
:param bytes salt: A salt. `NIST SP 800-132`_ recommends 128-bits or
longer.
:param int iterations: The number of iterations to perform of the hash
- function. See OWASP's `Password Storage Cheat Sheet`_ for more
+ function. This can be used to control the length of time the operation
+ takes. Higher numbers help mitigate brute force attacks against derived
+ keys. See OWASP's `Password Storage Cheat Sheet`_ for more
detailed recommendations if you intend to use this for password storage.
:param backend: A
:class:`~cryptography.hazmat.backends.interfaces.CipherBackend`