diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-05-02 12:04:53 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-05-02 13:04:53 -0400 |
| commit | 5fb10210276a10f104318504aa81d2ba9c42cba8 (patch) | |
| tree | 8367273ef18ec825150015719c98b54a23b0db00 | |
| parent | 2e84daa8e2a3bdcb52750b0589e2ee7ee0fd17ec (diff) | |
| download | cryptography-5fb10210276a10f104318504aa81d2ba9c42cba8.tar.gz cryptography-5fb10210276a10f104318504aa81d2ba9c42cba8.tar.bz2 cryptography-5fb10210276a10f104318504aa81d2ba9c42cba8.zip | |
add a changelog entry for finalize_with_tag and move the note (#3531)
| -rw-r--r-- | CHANGELOG.rst | 4 | ||||
| -rw-r--r-- | docs/hazmat/primitives/symmetric-encryption.rst | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d0988b34..5223fea0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,10 @@ Changelog .. note:: This version is not yet released and is under active development. +* Add support for providing ``tag`` during + :class:`~cryptography.hazmat.primitives.ciphers.modes.GCM` finalization via + :meth:`~cryptography.hazmat.primitives.ciphers.AEADDecryptionContext.finalize_with_tag`. + 1.8.1 - 2017-03-10 ~~~~~~~~~~~~~~~~~~ diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst index 5f4d7bf9..e99c2c0a 100644 --- a/docs/hazmat/primitives/symmetric-encryption.rst +++ b/docs/hazmat/primitives/symmetric-encryption.rst @@ -574,6 +574,10 @@ Interfaces .. method:: finalize_with_tag(tag) + .. note:: + + This method is not supported when compiled against OpenSSL 1.0.1. + :param bytes tag: The tag bytes to verify after decryption. :return bytes: Returns the remainder of the data. :raises ValueError: This is raised when the data provided isn't @@ -587,10 +591,6 @@ Interfaces object, this method must be used instead of :meth:`~cryptography.hazmat.primitives.ciphers.CipherContext.finalize`. - .. note:: - - This method is not supported when compiled against OpenSSL 1.0.1. - .. class:: CipherAlgorithm A named symmetric encryption algorithm. |