aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-03 18:17:57 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-03 18:17:57 -0600
commitcd28a7cca32c734ddd7f7ad353b27b2cf276aa6e (patch)
tree38606c73915696d7058d571e1cf19a7f4e7c75b0
parent5578c66babf3cb214114617bdd29c28129f31c37 (diff)
downloadcryptography-cd28a7cca32c734ddd7f7ad353b27b2cf276aa6e.tar.gz
cryptography-cd28a7cca32c734ddd7f7ad353b27b2cf276aa6e.tar.bz2
cryptography-cd28a7cca32c734ddd7f7ad353b27b2cf276aa6e.zip
remove AEADDecryptionContext references from GCM docs
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst17
1 files changed, 5 insertions, 12 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index c97d6b0b..bb0308bc 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -123,11 +123,11 @@ an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
When calling ``encryptor()`` or ``decryptor()`` on a ``Cipher`` object
with an AEAD mode you will receive a return object conforming to the
``AEADCipherContext`` interface (in addition to the ``CipherContext``
- interface and either the ``AEADEncryptionContext`` or ``AEADDecryptionContext``
- interface). ``AEADCipherContext`` contains an additional method
- ``authenticate_additional_data`` for adding additional authenticated but
- unencrypted data. You should call this before calls to ``update``. When you
- are done call ``finalize()`` to finish the operation.
+ interface). If it is an encryption context it will additionally be an
+ ``AEADEncryptionContext`` interface. ``AEADCipherContext`` contains an
+ additional method ``authenticate_additional_data`` for adding additional
+ authenticated but unencrypted data. You should call this before calls to
+ ``update``. When you are done call ``finalize()`` to finish the operation.
.. method:: authenticate_additional_data(data)
@@ -148,13 +148,6 @@ an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
:raises: :class:`~cryptography.exceptions.NotYetFinalized` if called
before the context is finalized.
-.. class:: AEADDecryptionContext
-
- When creating an encryption context using ``encryptor()`` on a ``Cipher``
- object with an AEAD mode you will receive a return object conforming to the
- ``AEADDecryptionContext`` interface (as well as ``AEADCipherContext``). This
- interface does not provide any additional methods or attributes.
-
.. _symmetric-encryption-algorithms:
Algorithms