diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-09 07:15:26 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-09 07:15:26 -0800 |
| commit | c65204eddf4cb029343c586a8c849b4ace67b25e (patch) | |
| tree | 6ad958752c1df8c4428ebbd9cccd272b5df13c63 /docs/hazmat/primitives/cryptographic-hashes.rst | |
| parent | 6b3be7f0078bd69f39b6666f7ea84040b7274e68 (diff) | |
| parent | df52fa9d388c2fc7d721c0fba5ca21ec88a01a15 (diff) | |
| download | cryptography-c65204eddf4cb029343c586a8c849b4ace67b25e.tar.gz cryptography-c65204eddf4cb029343c586a8c849b4ace67b25e.tar.bz2 cryptography-c65204eddf4cb029343c586a8c849b4ace67b25e.zip | |
Merge branch 'master' into padding-fixes
Conflicts:
cryptography/hazmat/primitives/padding.py
Diffstat (limited to 'docs/hazmat/primitives/cryptographic-hashes.rst')
| -rw-r--r-- | docs/hazmat/primitives/cryptographic-hashes.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/cryptographic-hashes.rst b/docs/hazmat/primitives/cryptographic-hashes.rst index 76ca20c0..20fa23cf 100644 --- a/docs/hazmat/primitives/cryptographic-hashes.rst +++ b/docs/hazmat/primitives/cryptographic-hashes.rst @@ -12,9 +12,9 @@ Message Digests results (with a high probability) in different digests. This is an implementation of - :class:`cryptography.hazmat.primitives.interfaces.HashContext` meant to + :class:`~cryptography.hazmat.primitives.interfaces.HashContext` meant to be used with - :class:`cryptography.hazmat.primitives.interfaces.HashAlgorithm` + :class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm` implementations to provide an incremental interface to calculating various message digests. @@ -102,7 +102,8 @@ MD5 .. warning:: MD5 is a deprecated hash algorithm that has practical known collision - attacks. You are strongly discouraged from using it. + attacks. You are strongly discouraged from using it. Existing applications + should strongly consider moving away. .. class:: MD5() |