aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-08 07:58:04 +0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-08 07:58:04 +0800
commit129d61e07243a6134eefa5c5de13c52f4e900794 (patch)
tree1f421fc954429a3471d9dfc1c5495d6b76bd88e3 /tests/hazmat
parenta5f04c053ca819d6d8be485d2b62a6bed8bdf195 (diff)
parent635b542ded9ede772a2ca907e8bb5349ded333bd (diff)
downloadcryptography-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 'tests/hazmat')
0 files changed, 0 insertions, 0 deletions