diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-19 07:38:19 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-19 07:38:19 -0800 |
| commit | b29a6b2e4623fa87fecaccc05551b996f684cd53 (patch) | |
| tree | f3579a5536862a304eaba25612f07f0c2515c8bd /tests/hazmat/primitives/test_cast5.py | |
| parent | 867acfa0300ca75f2c11c15490e04b556d8bfe99 (diff) | |
| parent | 62e96cbb0698d8f7d65d8dd2d301ef975a829d9e (diff) | |
| download | cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.tar.gz cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.tar.bz2 cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'tests/hazmat/primitives/test_cast5.py')
| -rw-r--r-- | tests/hazmat/primitives/test_cast5.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py index b2988437..a283dafc 100644 --- a/tests/hazmat/primitives/test_cast5.py +++ b/tests/hazmat/primitives/test_cast5.py @@ -19,19 +19,17 @@ import os from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test -from ...utils import load_nist_vectors_from_file +from ...utils import load_nist_vectors class TestCAST5(object): test_ECB = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), + load_nist_vectors, os.path.join("ciphers", "CAST5"), - [ - "cast5-ecb.txt", - ], + ["cast5-ecb.txt"], lambda key: algorithms.CAST5(binascii.unhexlify((key))), lambda key: modes.ECB(), - only_if=lambda backend: backend.ciphers.supported( + only_if=lambda backend: backend.cipher_supported( algorithms.CAST5("\x00" * 16), modes.ECB() ), skip_message="Does not support CAST5 ECB", |