diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-08-29 21:40:19 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-08-30 09:40:19 +0800 |
| commit | 2e8725d805ae4df7d44d54432b8c610723d8c7f9 (patch) | |
| tree | 13097e41c8965843fe8bc93fe5558e1a166acf00 | |
| parent | 3c35ef1ea77acc45aa71b6ad08ebe032e40e2c22 (diff) | |
| download | cryptography-2e8725d805ae4df7d44d54432b8c610723d8c7f9.tar.gz cryptography-2e8725d805ae4df7d44d54432b8c610723d8c7f9.tar.bz2 cryptography-2e8725d805ae4df7d44d54432b8c610723d8c7f9.zip | |
some docs cleanups + changelog (#3122)
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 18542035..fabc9139 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,8 @@ Changelog .. note:: This version is not yet released and is under active development. +* Deprecated support for OpenSSL 1.0.0. Support will be removed in + ``cryptography`` 1.7. * Added support for :class:`~cryptography.hazmat.primitives.hashes.BLAKE2b` and :class:`~cryptography.hazmat.primitives.hashes.BLAKE2s` when using OpenSSL 1.1.0. diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 558c9d16..873e0ff8 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -178,7 +178,7 @@ Different KDFs are suitable for different tasks such as: long as the hash output. Worse (shorter, less entropy) salt values can still meaningfully contribute to security. May be reused. Does not have to be secret, but may cause stronger security guarantees if secret; see - `RFC 5869`_ and the `HKDF paper`_ for more details. If ``None`` is + :rfc:`5869` and the `HKDF paper`_ for more details. If ``None`` is explicitly passed a default salt of ``algorithm.digest_size // 8`` null bytes will be used. @@ -793,6 +793,5 @@ Interface .. _`PBKDF2`: https://en.wikipedia.org/wiki/PBKDF2 .. _`scrypt`: https://en.wikipedia.org/wiki/Scrypt .. _`key stretching`: https://en.wikipedia.org/wiki/Key_stretching -.. _`HKDF`: -.. _`RFC 5869`: https://tools.ietf.org/html/rfc5869 +.. _`HKDF`: https://en.wikipedia.org/wiki/HKDF .. _`HKDF paper`: https://eprint.iacr.org/2010/264 |