aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-02-03 13:21:54 -0800
committerDavid Reid <dreid@dreid.org>2014-02-03 13:21:54 -0800
commit15ac790cfee3bf317f4d7a8c831daa7a694e6d7a (patch)
tree46828d79f35d64a8faec7ec0a62be8ff1c8015de /tests
parent26339c580801b1e893f48c3b23eb14da8655dfbb (diff)
downloadcryptography-15ac790cfee3bf317f4d7a8c831daa7a694e6d7a.tar.gz
cryptography-15ac790cfee3bf317f4d7a8c831daa7a694e6d7a.tar.bz2
cryptography-15ac790cfee3bf317f4d7a8c831daa7a694e6d7a.zip
Properly mark all test cases as dependant on HMAC.
Diffstat (limited to 'tests')
-rw-r--r--tests/hazmat/primitives/test_hkdf.py2
-rw-r--r--tests/hazmat/primitives/test_hkdf_vectors.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py
index 0497c66b..e3e2a9df 100644
--- a/tests/hazmat/primitives/test_hkdf.py
+++ b/tests/hazmat/primitives/test_hkdf.py
@@ -22,7 +22,7 @@ from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives.kdf.hkdf import HKDF
-@pytest.mark.hash
+@pytest.mark.hmac
class TestHKDF(object):
def test_length_limit(self, backend):
big_length = 255 * (hashes.SHA256().digest_size // 8) + 1
diff --git a/tests/hazmat/primitives/test_hkdf_vectors.py b/tests/hazmat/primitives/test_hkdf_vectors.py
index 5af4c14e..1e67234f 100644
--- a/tests/hazmat/primitives/test_hkdf_vectors.py
+++ b/tests/hazmat/primitives/test_hkdf_vectors.py
@@ -24,10 +24,10 @@ from ...utils import load_nist_vectors
@pytest.mark.supported(
- only_if=lambda backend: backend.hash_supported(hashes.SHA1()),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA1()),
skip_message="Does not support SHA1."
)
-@pytest.mark.hash
+@pytest.mark.hmac
class TestHKDFSHA1(object):
test_HKDFSHA1 = generate_hkdf_test(
load_nist_vectors,
@@ -38,10 +38,10 @@ class TestHKDFSHA1(object):
@pytest.mark.supported(
- only_if=lambda backend: backend.hash_supported(hashes.SHA256()),
+ only_if=lambda backend: backend.hmac_supported(hashes.SHA256()),
skip_message="Does not support SHA256."
)
-@pytest.mark.hash
+@pytest.mark.hmac
class TestHKDFSHA256(object):
test_HKDFSHA1 = generate_hkdf_test(
load_nist_vectors,