diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-12 09:23:02 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-12 09:23:02 -0800 |
| commit | 1d75bfa060ff55c4e415a8d34f8e55025fed9a86 (patch) | |
| tree | dbb32f57709358945325c14b09edcee993b29fb2 /tests/hazmat/primitives/test_cast5.py | |
| parent | d3683ec33d0ca1aa8b47bdafff65d79ee13ea08c (diff) | |
| parent | f7f6a9f77ade1b190766c37cc8967375b5093175 (diff) | |
| download | cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.tar.gz cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.tar.bz2 cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.zip | |
Merge pull request #244 from reaperhulk/less-loaders
Remove separate vector file loaders and replace with one
Diffstat (limited to 'tests/hazmat/primitives/test_cast5.py')
| -rw-r--r-- | tests/hazmat/primitives/test_cast5.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py index 4256e2c4..486b5b5a 100644 --- a/tests/hazmat/primitives/test_cast5.py +++ b/tests/hazmat/primitives/test_cast5.py @@ -19,12 +19,12 @@ 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), + load_nist_vectors, os.path.join("ciphers", "CAST5"), ["cast5-ecb.txt"], lambda key: algorithms.CAST5(binascii.unhexlify((key))), |