aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-12 11:23:34 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-12 11:23:34 -0500
commit66f380c30aedafa6a2f387fc3e1a077183128056 (patch)
tree7fd1fe98db5f92e3b8d24b767bb2021bbe978754 /CHANGELOG.rst
parent600a78fc34643a8d7ee65afad749acf67edfaecc (diff)
downloadcryptography-66f380c30aedafa6a2f387fc3e1a077183128056.tar.gz
cryptography-66f380c30aedafa6a2f387fc3e1a077183128056.tar.bz2
cryptography-66f380c30aedafa6a2f387fc3e1a077183128056.zip
cleanup a doctest and add a changelog entry for concatkdf
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d29dad4c..f521c11d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,8 @@ Changelog
:class:`~cryptography.hazmat.primitives.twofactor.hotp.HOTP` and
:class:`~cryptography.hazmat.primitives.twofactor.totp.TOTP` for generating
provisioning URIs.
+* Add :class:`~cryptography.hazmat.primitives.kdf.concatkdf.ConcatKDFHash`
+ and :class:`~cryptography.hazmat.primitives.kdf.concatkdf.ConcatKDFHMAC`.
0.9.1 - 2015-06-06
~~~~~~~~~~~~~~~~~~