aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-20 21:24:59 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-20 21:24:59 -0700
commitc34893c38c853ec341676337d26f5f10257b56b2 (patch)
tree0297b213105ad2a6f6de9859b2f0c393b7952273 /docs
parent41b33b70d3f9c937d80c264627d1195692a17863 (diff)
parent126afca70edc3fac2e493c6b7cd05219c8d8e373 (diff)
downloadcryptography-c34893c38c853ec341676337d26f5f10257b56b2.tar.gz
cryptography-c34893c38c853ec341676337d26f5f10257b56b2.tar.bz2
cryptography-c34893c38c853ec341676337d26f5f10257b56b2.zip
Merge branch 'master' into multi-fernet
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/interfaces.rst30
1 files changed, 28 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index 2d594c8d..4cb64c83 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -643,11 +643,13 @@ Key derivation functions
stored derived key.
-`CMAC`_
--------
+`Message Authentication Code`_
+------------------------------
.. class:: CMACContext
+ :class:`CMACContext` has been deprecated in favor of :class:`MACContext`.
+
.. versionadded:: 0.4
.. method:: update(data)
@@ -663,6 +665,30 @@ Key derivation functions
:return: A :class:`~cryptography.hazmat.primitives.interfaces.CMACContext`
that is a copy of the current context.
+.. class:: MACContext
+
+ .. versionadded:: 0.7
+
+ .. method:: update(data)
+
+ :param data bytes: The data you want to authenticate.
+
+ .. method:: finalize()
+
+ :return: The message authentication code.
+
+ .. method:: copy()
+
+ :return: A
+ :class:`~cryptography.hazmat.primitives.interfaces.MACContext` that
+ is a copy of the current context.
+
+ .. method:: verify(signature)
+
+ :param signature bytes: The signature to verify.
+
+ :raises cryptography.exceptions.InvalidSignature: This is raised when
+ the provided signature does not match the expected signature.
.. _`RSA`: https://en.wikipedia.org/wiki/RSA_(cryptosystem)
.. _`Chinese remainder theorem`: https://en.wikipedia.org/wiki/Chinese_remainder_theorem