aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
authorTerry Chia <terrycwk1994@gmail.com>2016-09-03 07:57:45 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2016-09-02 19:57:45 -0400
commita2d0da9bcd7b5660b5038c79b7168d6fb645971f (patch)
treefc281bf52c97116c9fc8bce7c43e06b25ef71538 /docs/hazmat/primitives
parent8bd420513e3a1f8594079889a5ca8f5d12fd00a6 (diff)
downloadcryptography-a2d0da9bcd7b5660b5038c79b7168d6fb645971f.tar.gz
cryptography-a2d0da9bcd7b5660b5038c79b7168d6fb645971f.tar.bz2
cryptography-a2d0da9bcd7b5660b5038c79b7168d6fb645971f.zip
Add bounds checking for Scrypt parameters. (#3130)
* Add bounds checking for Scrypt parameters. * Pep8. * More PEP8. * Change wording.
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 03260c06..511708d6 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -805,6 +805,9 @@ Different KDFs are suitable for different tasks such as:
:class:`~cryptography.hazmat.backends.interfaces.ScryptBackend`
:raises TypeError: This exception is raised if ``salt`` is not ``bytes``.
+ :raises ValueError: This exception is raised if ``n`` is less than 2, if
+ ``n`` is not a power of 2, if ``r`` is less than 1 or if ``p`` is less
+ than 1.
.. method:: derive(key_material)