diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 17:41:15 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 17:41:15 -0600 |
commit | 780366a3395d64aba6f09642b3ea2b6195307230 (patch) | |
tree | f60dd0f9e369e8b71305161279fc44774c6fc55d /tests/utils.py | |
parent | 3d8c66f9a01b8982902f69ae960fcc85aa43bfb8 (diff) | |
parent | 1ff8735d04f6fe5afe5bf7b516e365fbc5617918 (diff) | |
download | cryptography-780366a3395d64aba6f09642b3ea2b6195307230.tar.gz cryptography-780366a3395d64aba6f09642b3ea2b6195307230.tar.bz2 cryptography-780366a3395d64aba6f09642b3ea2b6195307230.zip |
Merge branch 'master' into pbkdf2-openssl
* master:
Fuck, fix
C is not a good programming language
This needs to be first
Doh, reorder
This type is not defined either of course
Whoops, backwards
Fixed #521 -- work on systems with no ec header at all
Diffstat (limited to 'tests/utils.py')
0 files changed, 0 insertions, 0 deletions