diff options
author | Julian Krause <julian.krause@gmail.com> | 2013-12-25 12:58:40 -0800 |
---|---|---|
committer | Julian Krause <julian.krause@gmail.com> | 2013-12-25 12:58:40 -0800 |
commit | e62760af74ebb8b08d7670dfaff177cdeb679f0f (patch) | |
tree | 70e51d6aadff7d1ec204793b12de221610204254 /docs/hazmat/primitives/interfaces.rst | |
parent | c91fe6a21fbae3107de7b2e53b7343cd67ac8c6d (diff) | |
parent | 0865a8b81075bfe073aba56e03cc57c30bfffe00 (diff) | |
download | cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.tar.gz cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.tar.bz2 cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.zip |
Merge branch 'master' of https://github.com/pyca/cryptography into verify
Conflicts:
tests/hazmat/primitives/test_hashes.py
tests/hazmat/primitives/test_hmac.py
Diffstat (limited to 'docs/hazmat/primitives/interfaces.rst')
-rw-r--r-- | docs/hazmat/primitives/interfaces.rst | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst index 11cff51a..361b723e 100644 --- a/docs/hazmat/primitives/interfaces.rst +++ b/docs/hazmat/primitives/interfaces.rst @@ -36,6 +36,17 @@ Symmetric Ciphers The number of bits in the key being used. +.. class:: BlockCipherAlgorithm + + A block cipher algorithm. + + .. attribute:: block_size + + :type: int + + The number of bits in a block. + + Cipher Modes ------------ |