diff options
| author | Hynek Schlawack <hs@ox.cx> | 2013-08-10 12:53:07 -0700 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2013-08-10 12:53:07 -0700 |
| commit | ccc5062166f673c0b572c4e3344c8f5a61661d50 (patch) | |
| tree | cacefd864a1cd1cfe79cc753ecf901264ff3977e | |
| parent | 9464859d6b57bb09ab119c90a4c98fcc635fa885 (diff) | |
| parent | acc787aebb30b311bcfbb49a569941d294ab94fc (diff) | |
| download | cryptography-ccc5062166f673c0b572c4e3344c8f5a61661d50.tar.gz cryptography-ccc5062166f673c0b572c4e3344c8f5a61661d50.tar.bz2 cryptography-ccc5062166f673c0b572c4e3344c8f5a61661d50.zip | |
Merge pull request #34 from alex/excise-padding
Fully excised padding from the docs
| -rw-r--r-- | docs/primitives/symmetric-encryption.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/primitives/symmetric-encryption.rst b/docs/primitives/symmetric-encryption.rst index 821e8e0f..0812f6b9 100644 --- a/docs/primitives/symmetric-encryption.rst +++ b/docs/primitives/symmetric-encryption.rst @@ -12,8 +12,8 @@ where the encrypter and decrypter both use the same key. .. code-block:: pycon - >>> from cryptography.primitives.block import BlockCipher, cipher, mode, padding - >>> cipher = BlockCipher(cipher.AES(key), mode.CBC(iv, padding.PKCS7())) + >>> from cryptography.primitives.block import BlockCipher, ciphers, modes + >>> cipher = BlockCipher(ciphers.AES(key), modes.CBC(iv)) >>> cipher.encrypt("my secret message") + cipher.finalize() # The ciphertext [...] @@ -36,7 +36,7 @@ where the encrypter and decrypter both use the same key. Ciphers ~~~~~~~ -.. class:: cryptography.primitives.block.cipher.AES(key) +.. class:: cryptography.primitives.block.ciphers.AES(key) AES (Advanced Encryption Standard) is a block cipher standardized by NIST. AES is both fast, and cryptographically strong. It is a good default @@ -49,7 +49,7 @@ Ciphers Modes ~~~~~ -.. class:: cryptography.primitives.block.mode.CBC(initialization_vector, padding) +.. class:: cryptography.primitives.block.modes.CBC(initialization_vector) CBC (Cipher block chaining) is a mode of operation for block ciphers. It is considered cryptographically strong. |