diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 04:25:41 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 04:25:41 -0700 |
| commit | aefd08be25c43576f8a0672cdf857390e044d7ea (patch) | |
| tree | 98103fa523afdbc5a9cead9e23245d8a7e6122dc /docs/primitives | |
| parent | 3be7983bba08821b10b4846f5efa4995020da613 (diff) | |
| parent | f54277876b76c867af3ad121bae7581b765fcb7c (diff) | |
| download | cryptography-aefd08be25c43576f8a0672cdf857390e044d7ea.tar.gz cryptography-aefd08be25c43576f8a0672cdf857390e044d7ea.tar.bz2 cryptography-aefd08be25c43576f8a0672cdf857390e044d7ea.zip | |
Merge pull request #72 from reaperhulk/camellia-support
Camellia support
Diffstat (limited to 'docs/primitives')
| -rw-r--r-- | docs/primitives/symmetric-encryption.rst | 9 |
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 ~~~~~ |