aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_cast5.py
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:42 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:42 -0500
commit08adc00087c8fe128abc2317776de1f974f4eed6 (patch)
tree9baacf858eb2ab752505cec675ddda118ed2f35d /tests/hazmat/primitives/test_cast5.py
parentcf99cc77f863a7254d449ecb5f80a35ad7db11ab (diff)
parentb645521e84026633f666aa107816ac2fc5e05cc6 (diff)
downloadcryptography-08adc00087c8fe128abc2317776de1f974f4eed6.tar.gz
cryptography-08adc00087c8fe128abc2317776de1f974f4eed6.tar.bz2
cryptography-08adc00087c8fe128abc2317776de1f974f4eed6.zip
Merge remote-tracking branch 'origin/master' into some-typedef-fixes
Diffstat (limited to 'tests/hazmat/primitives/test_cast5.py')
-rw-r--r--tests/hazmat/primitives/test_cast5.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py
index 406f9b55..a4789c65 100644
--- a/tests/hazmat/primitives/test_cast5.py
+++ b/tests/hazmat/primitives/test_cast5.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, modes
from .utils import generate_encrypt_test
from ...utils import load_nist_vectors
+@pytest.mark.cipher
class TestCAST5(object):
test_ECB = generate_encrypt_test(
load_nist_vectors,