diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-11-08 07:58:04 +0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-11-08 07:58:04 +0800 |
| commit | 129d61e07243a6134eefa5c5de13c52f4e900794 (patch) | |
| tree | 1f421fc954429a3471d9dfc1c5495d6b76bd88e3 /docs/hazmat/primitives/index.rst | |
| parent | a5f04c053ca819d6d8be485d2b62a6bed8bdf195 (diff) | |
| parent | 635b542ded9ede772a2ca907e8bb5349ded333bd (diff) | |
| download | cryptography-129d61e07243a6134eefa5c5de13c52f4e900794.tar.gz cryptography-129d61e07243a6134eefa5c5de13c52f4e900794.tar.bz2 cryptography-129d61e07243a6134eefa5c5de13c52f4e900794.zip | |
Merge branch 'master' into arc4-support
* master:
Typo
Be really explicit about what's good and bad
Mention return types.
Consistently use e.g.
Module documentation.
Single space.
Add a new Mode interface to document mode.name and start on some prose docs for interfaces.
Proper name for the iv thing.
Actually note the properties for cipher modes types on their ABCs.
Conflicts:
docs/hazmat/primitives/symmetric-encryption.rst
Diffstat (limited to 'docs/hazmat/primitives/index.rst')
| -rw-r--r-- | docs/hazmat/primitives/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/index.rst b/docs/hazmat/primitives/index.rst index c81018ae..614c414a 100644 --- a/docs/hazmat/primitives/index.rst +++ b/docs/hazmat/primitives/index.rst @@ -10,3 +10,4 @@ Primitives hmac symmetric-encryption padding + interfaces |