aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-28 15:07:49 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-28 15:07:49 -0600
commit98e40e658ef00dc6972f5420896bd57b385c8435 (patch)
treed9d922ec9483e9c289ceb0d6996e7846f7347f94 /docs/hazmat/primitives
parent695313ff7cb1a7026a2624b8c61d495978d6f41c (diff)
downloadcryptography-98e40e658ef00dc6972f5420896bd57b385c8435.tar.gz
cryptography-98e40e658ef00dc6972f5420896bd57b385c8435.tar.bz2
cryptography-98e40e658ef00dc6972f5420896bd57b385c8435.zip
rename PBKDF2 to PBKDF2HMAC, address many other review comments
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 51d73bc2..bad7a36c 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -35,7 +35,7 @@ using a pseudo-random function (PRF).
:class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm`
provider.
:param int length: The desired length of the derived key. Maximum is
- 2\ :sup:`31` - 1.
+ (2\ :sup:`32` - 1) * ``algorithm.digest_size``
: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