aboutsummaryrefslogtreecommitdiffstats
path: root/docs/primitives
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-09-27 13:43:06 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-06 17:31:31 -0500
commitdff22d4707a50b8164c5c6acd5521bcd91160cd1 (patch)
tree761787ecb9a65b941fcfd4907c16ee244f6bf9b4 /docs/primitives
parent867b979b81aba0578d7241d6a38201214a976ace (diff)
downloadcryptography-dff22d4707a50b8164c5c6acd5521bcd91160cd1.tar.gz
cryptography-dff22d4707a50b8164c5c6acd5521bcd91160cd1.tar.bz2
cryptography-dff22d4707a50b8164c5c6acd5521bcd91160cd1.zip
Camellia block cipher support
* Tests for CBC, OFB, CFB, and ECB * Tests will be automatically skipped if camellia support is not present in your OpenSSL library (e.g. OS X 10.8 with default OpenSSL) * Test for unsupported cipher in create_block_cipher_context * Docs for the cipher
Diffstat (limited to 'docs/primitives')
-rw-r--r--docs/primitives/symmetric-encryption.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/primitives/symmetric-encryption.rst b/docs/primitives/symmetric-encryption.rst
index 46d7c07c..c4bbf0a5 100644
--- a/docs/primitives/symmetric-encryption.rst
+++ b/docs/primitives/symmetric-encryption.rst
@@ -51,6 +51,15 @@ Ciphers
:param bytes key: The secret key, either ``128``, ``192``, or ``256`` bits.
This must be kept secret.
+.. class:: cryptography.primitives.block.ciphers.Camellia(key)
+
+ Camellia is a block cipher approved for use by CRYPTREC and ISO/IEC.
+ It is considered to have comparable security and performance to AES, but
+ is not as widely studied or deployed.
+
+ :param bytes key: The secret key, either ``128``, ``192``, or ``256`` bits.
+ This must be kept secret.
+
Modes
~~~~~