aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-21 11:20:56 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-29 17:19:45 -0600
commit65c4e0a396b9d4183d9ce16b27742d407eb9d91d (patch)
treedba0409fb1dc44c2548cd7d059e3a7e823fee89d /docs/hazmat/primitives
parentcf6032648a93329e93f40a3654c68d8d57cf0d63 (diff)
downloadcryptography-65c4e0a396b9d4183d9ce16b27742d407eb9d91d.tar.gz
cryptography-65c4e0a396b9d4183d9ce16b27742d407eb9d91d.tar.bz2
cryptography-65c4e0a396b9d4183d9ce16b27742d407eb9d91d.zip
gcm doc fixes
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 5b249c06..bd9a3f60 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -122,7 +122,7 @@ 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``
+ ``AEADCipherContext`` interface, in addition to the ``CipherContext``
interface. ``AEADCipherContext`` contains an additional method ``add_data``
for adding additional authenticated by non-encrypted data. You should call
this before calls to ``update``. When you are done call ``finalize()`` to
@@ -134,7 +134,7 @@ an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
:param bytes data: The data you wish to authenticate but not encrypt.
:raises: :class:`~cryptography.exceptions.AlreadyFinalized`
- .. method:: tag
+ .. attribute:: tag
:return bytes: Returns the tag value as bytes.
:raises: :class:`~cryptography.exceptions.NotFinalized`