aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-13 10:11:29 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-13 10:11:29 -0800
commit3340adfca3abb1353fc14f1baab7db6f6ca7b6a6 (patch)
tree2830b33a7974d2d5e238f1acf0426c9e6e2197b5 /docs
parent2b764a1c7b42a300a6e8b1446a25fdf13aa0eabd (diff)
parent70c90e965750da365e18d737faa6e08a1baf0f60 (diff)
downloadcryptography-3340adfca3abb1353fc14f1baab7db6f6ca7b6a6.tar.gz
cryptography-3340adfca3abb1353fc14f1baab7db6f6ca7b6a6.tar.bz2
cryptography-3340adfca3abb1353fc14f1baab7db6f6ca7b6a6.zip
Merge pull request #604 from reaperhulk/cast5-cbc-and-more
CAST5 Support (ECB, CBC, CFB, OFB)
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst11
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 85d8e8e3..210e6567 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -99,7 +99,6 @@ Algorithms
:param bytes key: The secret key, either ``128``, ``192``, or ``256`` bits.
This must be kept secret.
-
.. class:: TripleDES(key)
Triple DES (Data Encryption Standard), sometimes referred to as 3DES, is a
@@ -116,6 +115,15 @@ Algorithms
``56`` bits long), they can simply be concatenated to
produce the full key. This must be kept secret.
+.. class:: CAST5(key)
+
+ 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.
+
+ :param bytes key: The secret key, 40-128 bits in length (in increments of
+ 8). This must be kept secret.
+
Weak Ciphers
------------
@@ -469,3 +477,4 @@ Interfaces
.. _`described by Colin Percival`: http://www.daemonology.net/blog/2009-06-11-cryptographic-right-answers.html
.. _`recommends 96-bit IV length`: http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf
.. _`NIST SP-800-38D`: http://csrc.nist.gov/publications/nistpubs/800-38D/SP-800-38D.pdf
+.. _`Communications Security Establishment`: http://www.cse-cst.gc.ca