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/symmetric-encryption.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/symmetric-encryption.rst')
| -rw-r--r-- | docs/hazmat/primitives/symmetric-encryption.rst | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst index 85d8e8e3..d91dde9d 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,17 @@ Algorithms ``56`` bits long), they can simply be concatenated to produce the full key. This must be kept secret. +.. 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. + + :param bytes key: The secret key, 40-128 bits in length (in increments of + 8). This must be kept secret. + Weak Ciphers ------------ @@ -469,3 +479,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 |