| commit | e761f8b33519104605b14cf8a24e9f68bd23b624 | [log] [tgz] |
|---|---|---|
| author | Alex Gaynor <alex.gaynor@gmail.com> | Wed Oct 16 16:55:40 2013 -0700 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Wed Oct 16 16:55:40 2013 -0700 |
| tree | 672968fa7c23790bc9f5c9cd3c779adce09fae8c | |
| parent | 62ebc7e212a92a13c3836de5d129cb93f40a128d [diff] | |
| parent | 169dee88faa7c46b5551b89cf97a1b30c0a1c6ea [diff] |
Merge branch 'master' into triple-des Also moved most of the tests to the new format except for one which doesn't yet have an obvious translation Conflicts: cryptography/primitives/block/ciphers.py tests/primitives/test_nist.py