diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
| commit | f484d1ef03bc548dde300a59c91474d82169b1be (patch) | |
| tree | f3d79d1c6a22db5b90a5810ffe1a432be9c912df /tests/hazmat/primitives/test_hkdf_vectors.py | |
| parent | 971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff) | |
| parent | 2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff) | |
| download | cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.gz cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.bz2 cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.zip | |
Merge branch 'master' into verify-interfaces
Conflicts:
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'tests/hazmat/primitives/test_hkdf_vectors.py')
| -rw-r--r-- | tests/hazmat/primitives/test_hkdf_vectors.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_hkdf_vectors.py b/tests/hazmat/primitives/test_hkdf_vectors.py index 1e67234f..f2399a38 100644 --- a/tests/hazmat/primitives/test_hkdf_vectors.py +++ b/tests/hazmat/primitives/test_hkdf_vectors.py @@ -17,6 +17,7 @@ import os import pytest +from cryptography.hazmat.backends.interfaces import HMACBackend from cryptography.hazmat.primitives import hashes from .utils import generate_hkdf_test @@ -27,7 +28,7 @@ from ...utils import load_nist_vectors only_if=lambda backend: backend.hmac_supported(hashes.SHA1()), skip_message="Does not support SHA1." ) -@pytest.mark.hmac +@pytest.mark.requires_backend_interface(interface=HMACBackend) class TestHKDFSHA1(object): test_HKDFSHA1 = generate_hkdf_test( load_nist_vectors, @@ -41,7 +42,7 @@ class TestHKDFSHA1(object): only_if=lambda backend: backend.hmac_supported(hashes.SHA256()), skip_message="Does not support SHA256." ) -@pytest.mark.hmac +@pytest.mark.requires_backend_interface(interface=HMACBackend) class TestHKDFSHA256(object): test_HKDFSHA1 = generate_hkdf_test( load_nist_vectors, |