aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2013-11-13 18:38:37 -0800
committerDavid Reid <dreid@dreid.org>2013-11-13 18:38:37 -0800
commit9489c769dbd7ea7c6830b5fcd70095818452e607 (patch)
tree86a7a60981017575f923d6825471651a827d8e41 /docs
parent5ef7624d4a61c14b2247903149f4f2675db5b722 (diff)
parent272d537b90af00e5e5153f3818aee7ffe1df4f65 (diff)
downloadcryptography-9489c769dbd7ea7c6830b5fcd70095818452e607.tar.gz
cryptography-9489c769dbd7ea7c6830b5fcd70095818452e607.tar.bz2
cryptography-9489c769dbd7ea7c6830b5fcd70095818452e607.zip
Merge pull request #258 from alex/already-finalized
Use AlreadyFinalized for symmetric ciphers
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/cryptographic-hashes.rst2
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst5
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/cryptographic-hashes.rst b/docs/hazmat/primitives/cryptographic-hashes.rst
index 525fd889..52e87702 100644
--- a/docs/hazmat/primitives/cryptographic-hashes.rst
+++ b/docs/hazmat/primitives/cryptographic-hashes.rst
@@ -53,7 +53,7 @@ Message Digests
Finalize the current context and return the message digest as bytes.
Once ``finalize`` is called this object can no longer be used and
- :meth:`update` and :meth:`copy` will raise
+ :meth:`update`, :meth:`copy`, and :meth:`finalize` will raise
:class:`~cryptography.exceptions.AlreadyFinalized`.
:return bytes: The message digest as bytes.
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 28b143ba..4ef15459 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -79,6 +79,7 @@ an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
:param bytes data: The data you wish to pass into the context.
:return bytes: Returns the data that was encrypted or decrypted.
+ :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize`
When the ``Cipher`` was constructed in a mode that turns it into a
stream cipher (e.g.
@@ -90,6 +91,10 @@ an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
:return bytes: Returns the remainder of the data.
+ Once ``finalize`` is called this object can no longer be used and
+ :meth:`update` and :meth:`finalize` will raise
+ :class:`~cryptography.exceptions.AlreadyFinalized`.
+
Algorithms
~~~~~~~~~~