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_3des.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_3des.py')
| -rw-r--r-- | tests/hazmat/primitives/test_3des.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/hazmat/primitives/test_3des.py b/tests/hazmat/primitives/test_3des.py index 1543cfd7..69ec9c9a 100644 --- a/tests/hazmat/primitives/test_3des.py +++ b/tests/hazmat/primitives/test_3des.py @@ -23,12 +23,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 TestTripleDES_CBC(object): test_KAT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "CBC"), [ "TCBCinvperm.rsp", @@ -42,7 +42,7 @@ class TestTripleDES_CBC(object): ) test_MMT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "CBC"), [ "TCBCMMT1.rsp", @@ -58,7 +58,7 @@ class TestTripleDES_CBC(object): class TestTripleDES_OFB(object): test_KAT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "OFB"), [ "TOFBpermop.rsp", @@ -72,7 +72,7 @@ class TestTripleDES_OFB(object): ) test_MMT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "OFB"), [ "TOFBMMT1.rsp", @@ -88,7 +88,7 @@ class TestTripleDES_OFB(object): class TestTripleDES_CFB(object): test_KAT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "CFB"), [ "TCFB64invperm.rsp", @@ -102,7 +102,7 @@ class TestTripleDES_CFB(object): ) test_MMT = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "3DES", "CFB"), [ "TCFB64MMT1.rsp", |