diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-17 15:53:16 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-17 16:53:16 -0500 |
| commit | 62e22a5fb9d3e093f44b4075c7ddb5807d66409b (patch) | |
| tree | d8b001ebeb9d26c731c14a441933b0045fd35f6a /docs | |
| parent | 7f63e5b65d14dca6c4783d62fa5937a5a5c705e7 (diff) | |
| download | cryptography-62e22a5fb9d3e093f44b4075c7ddb5807d66409b.tar.gz cryptography-62e22a5fb9d3e093f44b4075c7ddb5807d66409b.tar.bz2 cryptography-62e22a5fb9d3e093f44b4075c7ddb5807d66409b.zip | |
Support byteslike in HKDF and PBKDF2HMAC (#4707)
* support byteslike in HKDF
* support byteslike in PBKDF2HMAC
* add missing docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 0f3d1afe..373fdbff 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -92,8 +92,9 @@ Different KDFs are suitable for different tasks such as: .. method:: derive(key_material) - :param bytes key_material: The input key material. For PBKDF2 this + :param key_material: The input key material. For PBKDF2 this should be a password. + :type key_material: :term:`bytes-like` :return bytes: the derived key. :raises cryptography.exceptions.AlreadyFinalized: This is raised when :meth:`derive` or @@ -199,7 +200,8 @@ Different KDFs are suitable for different tasks such as: .. method:: derive(key_material) - :param bytes key_material: The input key material. + :param key_material: The input key material. + :type key_material: :term:`bytes-like` :return bytes: The derived key. :raises TypeError: This exception is raised if ``key_material`` is not ``bytes``. |