diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2018-05-12 14:33:20 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-05-12 14:33:19 -0400 |
| commit | 617825d026a933e355d644ba12a408c63b8fb20f (patch) | |
| tree | b3f1e3e3d4c099f9c844b37960342da8aa8e156b /docs/hazmat | |
| parent | 36ad98fd5e4b7358dc2aa903b6d51569bf19c5f8 (diff) | |
| download | cryptography-617825d026a933e355d644ba12a408c63b8fb20f.tar.gz cryptography-617825d026a933e355d644ba12a408c63b8fb20f.tar.bz2 cryptography-617825d026a933e355d644ba12a408c63b8fb20f.zip | |
Fixed some confusing type descriptions in docs (#4231)
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 0196e438..0f3d1afe 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -282,7 +282,6 @@ Different KDFs are suitable for different tasks such as: :raises cryptography.exceptions.UnsupportedAlgorithm: This is raised if the provided ``backend`` does not implement :class:`~cryptography.hazmat.backends.interfaces.HMACBackend` - :raises TypeError: This is raised if the provided ``info`` is a unicode object :raises TypeError: This exception is raised if ``info`` is not ``bytes``. .. method:: derive(key_material) @@ -290,8 +289,6 @@ Different KDFs are suitable for different tasks such as: :param bytes key_material: The input key material. :return bytes: The derived key. - :raises TypeError: This is raised if the provided ``key_material`` is - a unicode object :raises TypeError: This exception is raised if ``key_material`` is not ``bytes``. @@ -314,7 +311,7 @@ Different KDFs are suitable for different tasks such as: called more than once. :raises TypeError: This is raised if the provided ``key_material`` is - a unicode object + a ``unicode`` object This checks whether deriving a new key from the supplied ``key_material`` generates the same key as the ``expected_key``, and |