aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/key-derivation-functions.rst
diff options
context:
space:
mode:
authorTerry Chia <terrycwk1994@gmail.com>2015-06-13 11:26:16 +0800
committerTerry Chia <terrycwk1994@gmail.com>2015-06-13 11:26:16 +0800
commitdae4076e6c9e4336f7ebde11adf46647bc73f424 (patch)
tree618c08fe7209e23b080bd37ca91e6afa6014a8d6 /docs/hazmat/primitives/key-derivation-functions.rst
parent646580584562d0caa505ab91e5fbb7404ab25d6c (diff)
downloadcryptography-dae4076e6c9e4336f7ebde11adf46647bc73f424.tar.gz
cryptography-dae4076e6c9e4336f7ebde11adf46647bc73f424.tar.bz2
cryptography-dae4076e6c9e4336f7ebde11adf46647bc73f424.zip
Remove mention of extract/expand operations from ConcatKDF docs.
Diffstat (limited to 'docs/hazmat/primitives/key-derivation-functions.rst')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 9fc8365f..35e2dd87 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -389,8 +389,7 @@ Different KDFs are suitable for different tasks such as:
:raises TypeError: This exception is raised if ``key_material`` is
not ``bytes``.
- Derives a new key from the input key material by performing both the
- extract and expand operations.
+ Derives a new key from the input key material.
.. method:: verify(key_material, expected_key)
@@ -485,8 +484,7 @@ Different KDFs are suitable for different tasks such as:
:raises TypeError: This exception is raised if ``key_material`` is not
``bytes``.
- Derives a new key from the input key material by performing both the
- extract and expand operations.
+ Derives a new key from the input key material.
.. method:: verify(key_material, expected_key)