diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-11-11 20:43:52 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-11-11 20:43:52 -0600 |
| commit | f7f6a9f77ade1b190766c37cc8967375b5093175 (patch) | |
| tree | ccaf9bcf7033a58c9e55f2996b328f108da66c1b /tests/hazmat/primitives/test_aes.py | |
| parent | 92beb221fc0a1bd8ef1b955a98e1385daed0f207 (diff) | |
| download | cryptography-f7f6a9f77ade1b190766c37cc8967375b5093175.tar.gz cryptography-f7f6a9f77ade1b190766c37cc8967375b5093175.tar.bz2 cryptography-f7f6a9f77ade1b190766c37cc8967375b5093175.zip | |
Remove separate file loaders and replace with one
All tests updated to work with the new simplified loader
Diffstat (limited to 'tests/hazmat/primitives/test_aes.py')
| -rw-r--r-- | tests/hazmat/primitives/test_aes.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py index c4818409..7c8cab72 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -20,13 +20,13 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test from ...utils import ( - load_nist_vectors_from_file, load_openssl_vectors_from_file + load_nist_vectors, load_openssl_vectors, ) class TestAES(object): test_CBC = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "AES", "CBC"), [ "CBCGFSbox128.rsp", @@ -50,7 +50,7 @@ class TestAES(object): ) test_ECB = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "AES", "ECB"), [ "ECBGFSbox128.rsp", @@ -74,7 +74,7 @@ class TestAES(object): ) test_OFB = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "AES", "OFB"), [ "OFBGFSbox128.rsp", @@ -98,7 +98,7 @@ class TestAES(object): ) test_CFB = generate_encrypt_test( - lambda path: load_nist_vectors_from_file(path), + load_nist_vectors, os.path.join("ciphers", "AES", "CFB"), [ "CFB128GFSbox128.rsp", @@ -122,7 +122,7 @@ class TestAES(object): ) test_CTR = generate_encrypt_test( - load_openssl_vectors_from_file, + load_openssl_vectors, os.path.join("ciphers", "AES", "CTR"), ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"], lambda key, iv: algorithms.AES(binascii.unhexlify(key)), |