diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-13 15:44:01 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-13 15:44:01 -0600 |
| commit | ba7d5ecd3e34c59ce58a4b1c2f86494602efe9e8 (patch) | |
| tree | e7e01d828b33e849c0ed84cb006139282504e82f /docs/hazmat/primitives/key-derivation-functions.rst | |
| parent | b477b53fc7e8afe64c380315e16eabfeaaaf7847 (diff) | |
| parent | 43e4d7a1b97d66c6da1f4ce34faaa4ba45937739 (diff) | |
| download | cryptography-ba7d5ecd3e34c59ce58a4b1c2f86494602efe9e8.tar.gz cryptography-ba7d5ecd3e34c59ce58a4b1c2f86494602efe9e8.tar.bz2 cryptography-ba7d5ecd3e34c59ce58a4b1c2f86494602efe9e8.zip | |
Merge branch 'master' into add-crt-coefficients
* master:
Also clean up this syntax
Fixed a missing word in the RSA docs
Fix comments in padding.py to be accurate
add versionadded to cast5
A few style nits in the docs
add CAST5 support to changelog
Changed .... lines to ~~~~ and s/Gnu\/Linux/Linux/
Pypy is not a real word either apparently.
Added Pypy note and fixed libffi's "spelling"
Added Debian mention, extra missing packages
Added a docs section on Linux installation
remove some extra linebreaks
add cast5 docs
Syntax highlight the go code. Be mad Rob Pike.
add cbc, cfb, ofb support to CAST5 (aka CAST128) for openssl & cc
re-add CAST5 ECB support (OpenSSL & CC backends). fixes #417
Switch this to a warning block
Be clear about HKDF's applicability for password storage
Conflicts:
docs/hazmat/primitives/rsa.rst
Diffstat (limited to 'docs/hazmat/primitives/key-derivation-functions.rst')
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 1937c2ec..d8a0e241 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -129,6 +129,10 @@ Different KDFs are suitable for different tasks such as: `HKDF`_ (HMAC-based Extract-and-Expand Key Derivation Function) is suitable for deriving keys of a fixed size used for other cryptographic operations. + .. warning:: + + HKDF should not be used for password storage. + .. doctest:: >>> import os |