diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-09 14:06:54 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-09 14:06:54 -0400 |
| commit | d0109a59993ba568bb81a67a062dcfb460692447 (patch) | |
| tree | 4efd634ba2b5a535b9054b9bebdfd515f88d9c06 /docs | |
| parent | cd26d88c4226fa1ceaf5f708b0912d8df4acaacf (diff) | |
| parent | 891efd9268d7c6e140e387a771ba5a07d8c8446d (diff) | |
| download | cryptography-d0109a59993ba568bb81a67a062dcfb460692447.tar.gz cryptography-d0109a59993ba568bb81a67a062dcfb460692447.tar.bz2 cryptography-d0109a59993ba568bb81a67a062dcfb460692447.zip | |
Merge pull request #1738 from reaperhulk/deprecation-dance
Do the deprecation dance
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 4 | ||||
| -rw-r--r-- | docs/hazmat/primitives/interfaces.rst | 22 |
2 files changed, 2 insertions, 24 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 0ce8f5f7..1af8d8f2 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -164,7 +164,7 @@ A specific ``backend`` may provide one or more of these interfaces. .. method:: create_cmac_ctx(algorithm) Create a - :class:`~cryptography.hazmat.primitives.interfaces.CMACContext` that + :class:`~cryptography.hazmat.primitives.interfaces.MACContext` that uses the specified ``algorithm`` to calculate a message authentication code. :param algorithm: An instance of a @@ -172,7 +172,7 @@ A specific ``backend`` may provide one or more of these interfaces. provider. :returns: - :class:`~cryptography.hazmat.primitives.interfaces.CMACContext` + :class:`~cryptography.hazmat.primitives.interfaces.MACContext` .. class:: PBKDF2HMACBackend diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst index f58d324d..d60fe186 100644 --- a/docs/hazmat/primitives/interfaces.rst +++ b/docs/hazmat/primitives/interfaces.rst @@ -51,28 +51,6 @@ In 0.8 the key derivation function interface was moved to the :mod:`cryptography.hazmat.primitives.kdf` module. -`Message Authentication Code`_ ------------------------------- - -.. class:: CMACContext - - :class:`CMACContext` has been deprecated in favor of :class:`MACContext`. - - .. versionadded:: 0.4 - - .. method:: update(data) - - :param bytes data: The data you want to authenticate. - - .. method:: finalize() - - :return: The message authentication code. - - .. method:: copy() - - :return: A :class:`~cryptography.hazmat.primitives.interfaces.CMACContext` - that is a copy of the current context. - .. class:: MACContext .. versionadded:: 0.7 |