aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_hkdf.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-24 07:49:33 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-24 07:49:33 -0700
commitf484d1ef03bc548dde300a59c91474d82169b1be (patch)
treef3d79d1c6a22db5b90a5810ffe1a432be9c912df /tests/hazmat/primitives/test_hkdf.py
parent971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff)
parent2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff)
downloadcryptography-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.py')
-rw-r--r--tests/hazmat/primitives/test_hkdf.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py
index 598f09f0..9b5d9638 100644
--- a/tests/hazmat/primitives/test_hkdf.py
+++ b/tests/hazmat/primitives/test_hkdf.py
@@ -22,13 +22,14 @@ import six
from cryptography.exceptions import (
AlreadyFinalized, InvalidKey, _Reasons
)
+from cryptography.hazmat.backends.interfaces import HMACBackend
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives.kdf.hkdf import HKDF, HKDFExpand
from ...utils import raises_unsupported_algorithm
-@pytest.mark.hmac
+@pytest.mark.requires_backend_interface(interface=HMACBackend)
class TestHKDF(object):
def test_length_limit(self, backend):
big_length = 255 * (hashes.SHA256().digest_size // 8) + 1
@@ -153,7 +154,7 @@ class TestHKDF(object):
hkdf.verify(b"foo", six.u("bar"))
-@pytest.mark.hmac
+@pytest.mark.requires_backend_interface(interface=HMACBackend)
class TestHKDFExpand(object):
def test_derive(self, backend):
prk = binascii.unhexlify(