diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-04 12:19:17 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-04 12:19:17 -0800 |
commit | ac6e02a0813e66f5e7cf75be0b3c7885a292c291 (patch) | |
tree | bc99e8f3f37e383d8ba166dec829fc1fe44ed92f /tests/hazmat/primitives/test_hmac.py | |
parent | 4969751fde0ef09cd72c738a80c32851c1b1f21d (diff) | |
parent | d68fd37ec18c5adfa580d989730f7988d72d2bea (diff) | |
download | cryptography-ac6e02a0813e66f5e7cf75be0b3c7885a292c291.tar.gz cryptography-ac6e02a0813e66f5e7cf75be0b3c7885a292c291.tar.bz2 cryptography-ac6e02a0813e66f5e7cf75be0b3c7885a292c291.zip |
Merge branch 'master' into setup-install-extension
Conflicts:
cryptography/hazmat/bindings/openssl/binding.py
Diffstat (limited to 'tests/hazmat/primitives/test_hmac.py')
-rw-r--r-- | tests/hazmat/primitives/test_hmac.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py index 04913af6..dd9cdaab 100644 --- a/tests/hazmat/primitives/test_hmac.py +++ b/tests/hazmat/primitives/test_hmac.py @@ -34,7 +34,7 @@ class UnsupportedDummyHash(object): @pytest.mark.supported( - only_if=lambda backend: backend.hmac_supported(hashes.MD5), + only_if=lambda backend: backend.hmac_supported(hashes.MD5()), skip_message="Does not support MD5", ) @pytest.mark.hmac |