diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-14 08:33:54 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-14 08:33:54 -0800 |
| commit | 4b0f9ab4e733f7183fc0f67acbc251b5d9a56758 (patch) | |
| tree | ad18caf3b26bd57a7cadfbdba4e5edd97d3c49f8 /docs/hazmat/bindings | |
| parent | 554df80072ede5e154020af39ce0c664de0582b5 (diff) | |
| parent | ca4a22b4dea8243d02bc4a2699048694e591ae75 (diff) | |
| download | cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.tar.gz cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.tar.bz2 cryptography-4b0f9ab4e733f7183fc0f67acbc251b5d9a56758.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'docs/hazmat/bindings')
| -rw-r--r-- | docs/hazmat/bindings/interfaces.rst | 4 | ||||
| -rw-r--r-- | docs/hazmat/bindings/openssl.rst | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/hazmat/bindings/interfaces.rst b/docs/hazmat/bindings/interfaces.rst index c55d86dc..711c82c2 100644 --- a/docs/hazmat/bindings/interfaces.rst +++ b/docs/hazmat/bindings/interfaces.rst @@ -69,6 +69,8 @@ A specific ``backend`` may provide one or more of these interfaces. :returns: :class:`~cryptography.hazmat.primitives.interfaces.CipherContext` + :raises ValueError: When tag is not None in an AEAD mode + .. method:: create_symmetric_decryption_ctx(cipher, mode) @@ -86,6 +88,8 @@ A specific ``backend`` may provide one or more of these interfaces. :returns: :class:`~cryptography.hazmat.primitives.interfaces.CipherContext` + :raises ValueError: When tag is None in an AEAD mode + .. class:: HashBackend diff --git a/docs/hazmat/bindings/openssl.rst b/docs/hazmat/bindings/openssl.rst index 194eeb92..d6bfa672 100644 --- a/docs/hazmat/bindings/openssl.rst +++ b/docs/hazmat/bindings/openssl.rst @@ -21,5 +21,5 @@ These are `CFFI`_ bindings to the `OpenSSL`_ C library. and access constants. -.. _`CFFI`: http://cffi.readthedocs.org/ +.. _`CFFI`: https://cffi.readthedocs.org/ .. _`OpenSSL`: https://www.openssl.org/ |