diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-10 15:18:47 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-10 15:18:47 -0400 |
| commit | 6a37d27953f2d6075c6834eea46bb762ca523c22 (patch) | |
| tree | adbeafd125f3d579d2e9918024bf8dfcd4aa50db | |
| parent | adacdb85a6e102a0b9ee188ccfce93c22bde182e (diff) | |
| parent | 34c7a91c08413b92d6eec033a350d1d9423a3a9d (diff) | |
| download | cryptography-6a37d27953f2d6075c6834eea46bb762ca523c22.tar.gz cryptography-6a37d27953f2d6075c6834eea46bb762ca523c22.tar.bz2 cryptography-6a37d27953f2d6075c6834eea46bb762ca523c22.zip | |
Merge branch 'master' into simple-symmetric-encryption
| -rw-r--r-- | docs/primitives/symmetric-encryption.rst | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docs/primitives/symmetric-encryption.rst b/docs/primitives/symmetric-encryption.rst index 29eb2823..090e8e29 100644 --- a/docs/primitives/symmetric-encryption.rst +++ b/docs/primitives/symmetric-encryption.rst @@ -61,9 +61,3 @@ Modes ``block_size`` of the cipher. Do not reuse an ``initialization_vector`` with a given ``key``. - :param padding: One of the paddings described below. - -Paddings -~~~~~~~~ - -.. class:: cryptography.primitives.block.padding.PKCS7() |