aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-20 21:27:08 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-20 21:27:08 -0700
commit4c82513ac8ae9b319eecb1fc18d11c55305c1663 (patch)
treed00d52f02e4e49d0f2809b4de07b7af909f52eba
parentc34893c38c853ec341676337d26f5f10257b56b2 (diff)
downloadcryptography-4c82513ac8ae9b319eecb1fc18d11c55305c1663.tar.gz
cryptography-4c82513ac8ae9b319eecb1fc18d11c55305c1663.tar.bz2
cryptography-4c82513ac8ae9b319eecb1fc18d11c55305c1663.zip
added docs stuff on when added
-rw-r--r--CHANGELOG.rst2
-rw-r--r--docs/fernet.rst2
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c8cec58d..1d69d9cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,8 @@ Changelog
.. note:: This version is not yet released and is under active development.
+* Added key-rotation support to :doc:`Fernet </fernet>` with
+ :class:`~cryptography.fernet.MultiFernet`.
* More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys
from numbers.
* Added :class:`~cryptography.hazmat.primitives.interfaces.MACContext` as a
diff --git a/docs/fernet.rst b/docs/fernet.rst
index 1ff6cdbf..f1a4c748 100644
--- a/docs/fernet.rst
+++ b/docs/fernet.rst
@@ -75,6 +75,8 @@ has support for implementing key rotation via :class:`MultiFernet`.
.. class:: MultiFernet(fernets)
+ .. versionadded:: 0.7
+
This class implements key rotation for Fernet. It takes a ``list`` of
:class:`Fernet` instances, and implements the same API: