aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/key-derivation-functions.rst
diff options
context:
space:
mode:
authorAyrx <terrycwk1994@gmail.com>2014-05-10 13:01:46 +0800
committerAyrx <terrycwk1994@gmail.com>2014-05-10 13:01:46 +0800
commitc48100a9126990552197b5431d22f7a9e065baf7 (patch)
tree35a62068f5b1f54e2936f697bb5ad7ce3080482e /docs/hazmat/primitives/key-derivation-functions.rst
parent2d6cd449f1ad3448798d77d9216aded95b861a8d (diff)
downloadcryptography-c48100a9126990552197b5431d22f7a9e065baf7.tar.gz
cryptography-c48100a9126990552197b5431d22f7a9e065baf7.tar.bz2
cryptography-c48100a9126990552197b5431d22f7a9e065baf7.zip
Added missing exception to documentation
Diffstat (limited to 'docs/hazmat/primitives/key-derivation-functions.rst')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 11fbd4e0..fdc540b9 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -276,12 +276,16 @@ 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
.. method:: derive(key_material)
: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
+
Derives a new key from the input key material by performing both the
extract and expand operations.
@@ -300,6 +304,8 @@ Different KDFs are suitable for different tasks such as:
:meth:`verify` is
called more than
once.
+ :raises TypeError: This is raised if the provided ``key_material`` is
+ a unicode object
This checks whether deriving a new key from the supplied
``key_material`` generates the same key as the ``expected_key``, and