Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into validate-iv | Alex Gaynor | 2014-01-02 | 1 | -11/+6 |
|\ | | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py | ||||
| * | Make lib and ffi be private on backend | Alex Gaynor | 2014-01-01 | 1 | -11/+6 |
| | | | | | | | | Because now they are public on a binding instance if you need them! | ||||
* | | Merge branch 'master' into validate-iv | Alex Gaynor | 2014-01-01 | 1 | -4/+8 |
|\| | | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py | ||||
| * | UnsupportedAlgorithm error messages for Ciphers | Alex Stapleton | 2013-12-22 | 1 | -5/+7 |
| | | |||||
* | | Merge branch 'master' into validate-iv | Alex Gaynor | 2013-12-15 | 1 | -1/+2 |
|/ | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py tests/hazmat/primitives/test_block.py | ||||
* | Also rename teh tests | Alex Gaynor | 2013-12-13 | 2 | -0/+97 |