diff options
| author | David Reid <dreid@dreid.org> | 2013-11-06 09:48:00 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-06 09:48:00 -0800 |
| commit | 30eff66f48189671740f6f1a423454c68dcb9ae8 (patch) | |
| tree | 5d8b58ac917d5cfcf9be209127a84de03ea942e1 /tests/hazmat/primitives/test_cast5.py | |
| parent | e71121bd9756112f141d7f02bf734ba496c70472 (diff) | |
| parent | dd0b51b92d9bafe6aaacc2565ace0c591a493965 (diff) | |
| download | cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.tar.gz cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.tar.bz2 cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.zip | |
Merge pull request #226 from reaperhulk/blockcipher-rename
Reorganize Block Cipher
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", ) |