aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/backends
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into validate-ivAlex Gaynor2014-01-021-11/+6
|\ | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py
| * Make lib and ffi be private on backendAlex Gaynor2014-01-011-11/+6
| | | | | | | | Because now they are public on a binding instance if you need them!
* | Merge branch 'master' into validate-ivAlex Gaynor2014-01-011-4/+8
|\| | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py
| * UnsupportedAlgorithm error messages for CiphersAlex Stapleton2013-12-221-5/+7
| |
* | Merge branch 'master' into validate-ivAlex Gaynor2013-12-151-1/+2
|/ | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py tests/hazmat/primitives/test_block.py
* Also rename teh testsAlex Gaynor2013-12-132-0/+97