diff options
| author | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
| commit | fcd36a9bb98fe6e13bc37cc833f317a3ee656eef (patch) | |
| tree | adc44cfbca50c99f261c45d893d9378ea57e673b /tests/hazmat/primitives/test_hmac.py | |
| parent | 9d0d94d97cb8ed8d15b24018e20c08cf1f7b78b4 (diff) | |
| parent | 4faa094526f49c83a75d21a6e796546d4d539c6c (diff) | |
| download | cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.gz cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.bz2 cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.zip | |
Merge branch 'master' into hmac-context-from-backend
Conflicts:
cryptography/hazmat/bindings/openssl/backend.py
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'tests/hazmat/primitives/test_hmac.py')
0 files changed, 0 insertions, 0 deletions