aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_hmac_vectors.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-01-04 12:19:17 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-01-04 12:19:17 -0800
commitac6e02a0813e66f5e7cf75be0b3c7885a292c291 (patch)
treebc99e8f3f37e383d8ba166dec829fc1fe44ed92f /tests/hazmat/primitives/test_hmac_vectors.py
parent4969751fde0ef09cd72c738a80c32851c1b1f21d (diff)
parentd68fd37ec18c5adfa580d989730f7988d72d2bea (diff)
downloadcryptography-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_vectors.py')
-rw-r--r--tests/hazmat/primitives/test_hmac_vectors.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/hazmat/primitives/test_hmac_vectors.py b/tests/hazmat/primitives/test_hmac_vectors.py
index c5644459..0792080b 100644
--- a/tests/hazmat/primitives/test_hmac_vectors.py
+++ b/tests/hazmat/primitives/test_hmac_vectors.py
@@ -22,7 +22,7 @@ from ...utils import load_hash_vectors
@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
@@ -38,7 +38,7 @@ class TestHMAC_MD5(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.SHA1),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA1()),
skip_message="Does not support SHA1",
)
@pytest.mark.hmac
@@ -54,7 +54,7 @@ class TestHMAC_SHA1(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.SHA224),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA224()),
skip_message="Does not support SHA224",
)
@pytest.mark.hmac
@@ -70,7 +70,7 @@ class TestHMAC_SHA224(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.SHA256),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA256()),
skip_message="Does not support SHA256",
)
@pytest.mark.hmac
@@ -86,7 +86,7 @@ class TestHMAC_SHA256(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.SHA384),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA384()),
skip_message="Does not support SHA384",
)
@pytest.mark.hmac
@@ -102,7 +102,7 @@ class TestHMAC_SHA384(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.SHA512),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA512()),
skip_message="Does not support SHA512",
)
@pytest.mark.hmac
@@ -118,7 +118,7 @@ class TestHMAC_SHA512(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hmac_supported(hashes.RIPEMD160),
+ only_if=lambda backend: backend.hmac_supported(hashes.RIPEMD160()),
skip_message="Does not support RIPEMD160",
)
@pytest.mark.hmac