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_camellia.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_camellia.py')
| -rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index e1be5d1d..223269a2 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -20,13 +20,13 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test from ...utils import ( - load_cryptrec_vectors_from_file, load_openssl_vectors_from_file + load_cryptrec_vectors, load_openssl_vectors ) class TestCamellia(object): test_ECB = generate_encrypt_test( - load_cryptrec_vectors_from_file, + load_cryptrec_vectors, os.path.join("ciphers", "Camellia"), [ "camellia-128-ecb.txt", @@ -42,7 +42,7 @@ class TestCamellia(object): ) test_CBC = generate_encrypt_test( - load_openssl_vectors_from_file, + load_openssl_vectors, os.path.join("ciphers", "Camellia"), ["camellia-cbc.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), @@ -54,7 +54,7 @@ class TestCamellia(object): ) test_OFB = generate_encrypt_test( - load_openssl_vectors_from_file, + load_openssl_vectors, os.path.join("ciphers", "Camellia"), ["camellia-ofb.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), @@ -66,7 +66,7 @@ class TestCamellia(object): ) test_CFB = generate_encrypt_test( - load_openssl_vectors_from_file, + load_openssl_vectors, os.path.join("ciphers", "Camellia"), ["camellia-cfb.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), |