From ebee006d2fd57194db61566a29d08739d19738b5 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 7 Mar 2015 12:34:33 -0600 Subject: Do the deprecation dance --- CHANGELOG.rst | 3 +-- docs/hazmat/primitives/interfaces.rst | 22 ---------------------- .../hazmat/primitives/interfaces/__init__.py | 7 ------- src/cryptography/utils.py | 3 +-- 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2ab9c755..ed68455b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -156,8 +156,7 @@ Changelog * More bit-lengths are now supported for ``p`` and ``q`` when loading DSA keys from numbers. * Added :class:`~cryptography.hazmat.primitives.interfaces.MACContext` as a - common interface for CMAC and HMAC and deprecated - :class:`~cryptography.hazmat.primitives.interfaces.CMACContext`. + common interface for CMAC and HMAC and deprecated ``CMACContext``. * Added support for encoding and decoding :rfc:`6979` signatures in :doc:`/hazmat/primitives/asymmetric/utils`. * Added 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 diff --git a/src/cryptography/hazmat/primitives/interfaces/__init__.py b/src/cryptography/hazmat/primitives/interfaces/__init__.py index 6913ace9..1e7b1215 100644 --- a/src/cryptography/hazmat/primitives/interfaces/__init__.py +++ b/src/cryptography/hazmat/primitives/interfaces/__init__.py @@ -386,10 +386,3 @@ class MACContext(object): Checks if the generated message authentication code matches the signature. """ - -CMACContext = utils.deprecated( - MACContext, - __name__, - "The CMACContext interface has been renamed to MACContext", - utils.DeprecatedIn07 -) diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 253dea55..0f8cbb27 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -10,8 +10,7 @@ import sys import warnings -DeprecatedIn07 = DeprecationWarning -DeprecatedIn08 = PendingDeprecationWarning +DeprecatedIn08 = DeprecationWarning def read_only_property(name): -- cgit v1.2.3 From 891efd9268d7c6e140e387a771ba5a07d8c8446d Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 9 Mar 2015 09:25:22 -0500 Subject: missed some links --- docs/hazmat/backends/interfaces.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3