diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-07 14:25:44 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-07 14:25:44 -0800 |
| commit | 60f1d8b89cf7eb6f4d58eed7be9b816056c1df9c (patch) | |
| tree | 5912a5ebeec4f4ffe8ecd6b0fd11b1794a8772c5 /tests/hazmat/primitives/test_cast5.py | |
| parent | 105e8137799a2ef7ec8275e3c01d61a04884413b (diff) | |
| parent | 635b542ded9ede772a2ca907e8bb5349ded333bd (diff) | |
| download | cryptography-60f1d8b89cf7eb6f4d58eed7be9b816056c1df9c.tar.gz cryptography-60f1d8b89cf7eb6f4d58eed7be9b816056c1df9c.tar.bz2 cryptography-60f1d8b89cf7eb6f4d58eed7be9b816056c1df9c.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'tests/hazmat/primitives/test_cast5.py')
| -rw-r--r-- | tests/hazmat/primitives/test_cast5.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py index bd861150..b2988437 100644 --- a/tests/hazmat/primitives/test_cast5.py +++ b/tests/hazmat/primitives/test_cast5.py @@ -16,7 +16,7 @@ from __future__ import absolute_import, division, print_function import binascii import os -from cryptography.hazmat.primitives.block import ciphers, modes +from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test from ...utils import load_nist_vectors_from_file @@ -29,10 +29,10 @@ class TestCAST5(object): [ "cast5-ecb.txt", ], - lambda key: ciphers.CAST5(binascii.unhexlify((key))), + lambda key: algorithms.CAST5(binascii.unhexlify((key))), lambda key: modes.ECB(), only_if=lambda backend: backend.ciphers.supported( - ciphers.CAST5("\x00" * 16), modes.ECB() + algorithms.CAST5("\x00" * 16), modes.ECB() ), skip_message="Does not support CAST5 ECB", ) |