diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:22 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:22 -0700 |
| commit | 6183977b8bcad36902c7ce73f63771a4efdee83f (patch) | |
| tree | ddce33059c217608385eb63addcf1bc43cfc1987 /tests/hazmat/primitives/test_aes.py | |
| parent | 0e5fd074b79f6dc86bcc643772b731594bcbb011 (diff) | |
| parent | ff7ac75cc766b0483c7de25986f1c59d496ba68c (diff) | |
| download | cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.tar.gz cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.tar.bz2 cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.zip | |
Merge pull request #205 from reaperhulk/simplify-tests
Simplify some test class structure
Diffstat (limited to 'tests/hazmat/primitives/test_aes.py')
| -rw-r--r-- | tests/hazmat/primitives/test_aes.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py index 0caac3b8..192da648 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -11,10 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -""" -Test using the NIST Test Vectors -""" - from __future__ import absolute_import, division, print_function import binascii @@ -28,7 +24,7 @@ from ...utils import ( ) -class TestAES_CBC(object): +class TestAES(object): test_CBC = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "CBC"), @@ -53,8 +49,6 @@ class TestAES_CBC(object): lambda key, iv: modes.CBC(binascii.unhexlify(iv)), ) - -class TestAES_ECB(object): test_ECB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "ECB"), @@ -79,8 +73,6 @@ class TestAES_ECB(object): lambda key: modes.ECB(), ) - -class TestAES_OFB(object): test_OFB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "OFB"), @@ -105,8 +97,6 @@ class TestAES_OFB(object): lambda key, iv: modes.OFB(binascii.unhexlify(iv)), ) - -class TestAES_CFB(object): test_CFB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "CFB"), @@ -131,8 +121,6 @@ class TestAES_CFB(object): lambda key, iv: modes.CFB(binascii.unhexlify(iv)), ) - -class TestAES_CTR(object): test_CTR = generate_encrypt_test( load_openssl_vectors_from_file, os.path.join("ciphers", "AES", "CTR"), |