diff options
| author | Julian Krause <julian.krause@gmail.com> | 2013-12-25 12:58:40 -0800 |
|---|---|---|
| committer | Julian Krause <julian.krause@gmail.com> | 2013-12-25 12:58:40 -0800 |
| commit | e62760af74ebb8b08d7670dfaff177cdeb679f0f (patch) | |
| tree | 70e51d6aadff7d1ec204793b12de221610204254 /tests/hazmat/primitives/test_arc4.py | |
| parent | c91fe6a21fbae3107de7b2e53b7343cd67ac8c6d (diff) | |
| parent | 0865a8b81075bfe073aba56e03cc57c30bfffe00 (diff) | |
| download | cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.tar.gz cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.tar.bz2 cryptography-e62760af74ebb8b08d7670dfaff177cdeb679f0f.zip | |
Merge branch 'master' of https://github.com/pyca/cryptography into verify
Conflicts:
tests/hazmat/primitives/test_hashes.py
tests/hazmat/primitives/test_hmac.py
Diffstat (limited to 'tests/hazmat/primitives/test_arc4.py')
| -rw-r--r-- | tests/hazmat/primitives/test_arc4.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/hazmat/primitives/test_arc4.py b/tests/hazmat/primitives/test_arc4.py index d233bec2..f2e2452c 100644 --- a/tests/hazmat/primitives/test_arc4.py +++ b/tests/hazmat/primitives/test_arc4.py @@ -16,12 +16,15 @@ from __future__ import absolute_import, division, print_function import binascii import os +import pytest + from cryptography.hazmat.primitives.ciphers import algorithms from .utils import generate_stream_encryption_test from ...utils import load_nist_vectors +@pytest.mark.cipher class TestARC4(object): test_rfc = generate_stream_encryption_test( load_nist_vectors, @@ -35,7 +38,7 @@ class TestARC4(object): "rfc-6229-192.txt", "rfc-6229-256.txt", ], - lambda key: algorithms.ARC4(binascii.unhexlify((key))), + lambda key, **kwargs: algorithms.ARC4(binascii.unhexlify(key)), only_if=lambda backend: backend.cipher_supported( algorithms.ARC4("\x00" * 16), None ), |