diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-17 15:56:23 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-17 16:56:23 -0500 |
| commit | a77994408da328e6b0fba331211be9ad2db5c5b6 (patch) | |
| tree | 240940ee473a526d3438514799665dc4463dc0d8 /docs/hazmat | |
| parent | 2b40f493bf6f9eb131b46d7ab582b89033bcda64 (diff) | |
| download | cryptography-a77994408da328e6b0fba331211be9ad2db5c5b6.tar.gz cryptography-a77994408da328e6b0fba331211be9ad2db5c5b6.tar.bz2 cryptography-a77994408da328e6b0fba331211be9ad2db5c5b6.zip | |
support byteslike in ConcatKDF{HMAC,Hash}, Scrypt, and X963KDF (#4709)
* byteslike concatkdf
* byteslike scrypt
* byteslike x963kdf
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 373fdbff..64a22c0e 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -377,7 +377,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``. @@ -562,7 +563,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``. @@ -813,7 +815,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``. |