aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-13 11:44:24 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-13 11:44:24 -0800
commit811163e609c2df4f785473376f914d224d896f07 (patch)
tree73498c54dccb02850c68a9b72944facda3782483 /docs/hazmat
parentc3aa3d7a783020cce621156e463fd1bed7da13dc (diff)
parenta5011ec2863d1a698780153a5f2498bd69add56f (diff)
downloadcryptography-811163e609c2df4f785473376f914d224d896f07.tar.gz
cryptography-811163e609c2df4f785473376f914d224d896f07.tar.bz2
cryptography-811163e609c2df4f785473376f914d224d896f07.zip
Merge pull request #608 from reaperhulk/cast5-changelog
Add CAST5 support to changelog
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 210e6567..d91dde9d 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -117,6 +117,8 @@ Algorithms
.. class:: CAST5(key)
+ .. versionadded:: 0.2
+
CAST5 (also known as CAST-128) is a block cipher approved for use in the
Canadian government by the `Communications Security Establishment`_. It is
a variable key length cipher and supports keys from 40-128 bits in length.