diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-06-13 04:37:22 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-06-13 04:37:22 -0500 |
| commit | 6c057310867ece8c480df2a448c4301166547aab (patch) | |
| tree | 618c08fe7209e23b080bd37ca91e6afa6014a8d6 /docs/hazmat | |
| parent | 646580584562d0caa505ab91e5fbb7404ab25d6c (diff) | |
| parent | dae4076e6c9e4336f7ebde11adf46647bc73f424 (diff) | |
| download | cryptography-6c057310867ece8c480df2a448c4301166547aab.tar.gz cryptography-6c057310867ece8c480df2a448c4301166547aab.tar.bz2 cryptography-6c057310867ece8c480df2a448c4301166547aab.zip | |
Merge pull request #2028 from Ayrx/fix-docs
Remove mention of extract/expand operations from ConcatKDF docs.
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 6 |
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) |