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_arc4.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_arc4.py')
-rw-r--r-- | tests/hazmat/primitives/test_arc4.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/hazmat/primitives/test_arc4.py b/tests/hazmat/primitives/test_arc4.py index 33f7ff09..cd0da910 100644 --- a/tests/hazmat/primitives/test_arc4.py +++ b/tests/hazmat/primitives/test_arc4.py @@ -18,6 +18,7 @@ import os import pytest +from cryptography.hazmat.backends.interfaces import CipherBackend from cryptography.hazmat.primitives.ciphers import algorithms from .utils import generate_stream_encryption_test @@ -30,7 +31,7 @@ from ...utils import load_nist_vectors ), skip_message="Does not support ARC4", ) -@pytest.mark.cipher +@pytest.mark.requires_backend_interface(interface=CipherBackend) class TestARC4(object): test_rfc = generate_stream_encryption_test( load_nist_vectors, |