aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
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 /docs/hazmat/primitives
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 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst1
1 files changed, 0 insertions, 1 deletions
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(),