diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-12 14:35:05 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-12 14:35:05 -0400 |
| commit | 646580584562d0caa505ab91e5fbb7404ab25d6c (patch) | |
| tree | 7fd1fe98db5f92e3b8d24b767bb2021bbe978754 | |
| parent | 600a78fc34643a8d7ee65afad749acf67edfaecc (diff) | |
| parent | 66f380c30aedafa6a2f387fc3e1a077183128056 (diff) | |
| download | cryptography-646580584562d0caa505ab91e5fbb7404ab25d6c.tar.gz cryptography-646580584562d0caa505ab91e5fbb7404ab25d6c.tar.bz2 cryptography-646580584562d0caa505ab91e5fbb7404ab25d6c.zip | |
Merge pull request #2026 from reaperhulk/small-cleanup
cleanup a doctest and add a changelog entry for concatkdf
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 1 |
2 files changed, 2 insertions, 1 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 ~~~~~~~~~~~~~~~~~~ diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 7def2a22..9fc8365f 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -345,7 +345,6 @@ Different KDFs are suitable for different tasks such as: >>> from cryptography.hazmat.primitives.kdf.concatkdf import ConcatKDFHash >>> from cryptography.hazmat.backends import default_backend >>> backend = default_backend() - >>> salt = os.urandom(16) >>> otherinfo = b"concatkdf-example" >>> ckdf = ConcatKDFHash( ... algorithm=hashes.SHA256(), |