diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-06 14:10:59 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-06 14:10:59 -0800 |
| commit | 8b347932fb3612e622d07643af62ed939976b9cb (patch) | |
| tree | 72837619ab4e9064ff50649f245ed3ee316ce66e /tests/hazmat/primitives/test_aes.py | |
| parent | 25d24de1417844f95b247365a3fb24f17bf120ff (diff) | |
| parent | 1e8aa9b09351bf0fb47bed24defc4d9f37560e31 (diff) | |
| download | cryptography-8b347932fb3612e622d07643af62ed939976b9cb.tar.gz cryptography-8b347932fb3612e622d07643af62ed939976b9cb.tar.bz2 cryptography-8b347932fb3612e622d07643af62ed939976b9cb.zip | |
Merge branch 'master' into exception-heirarchy-refactor
Conflicts:
cryptography/hazmat/backends/openssl/backend.py
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 157d3536..ad3626af 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -31,7 +31,7 @@ from ...utils import load_nist_vectors skip_message="Does not support AES CBC", ) @pytest.mark.cipher -class TestAES_CBC(object): +class TestAESModeCBC(object): test_CBC = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "AES", "CBC"), @@ -64,7 +64,7 @@ class TestAES_CBC(object): skip_message="Does not support AES ECB", ) @pytest.mark.cipher -class TestAES_ECB(object): +class TestAESModeECB(object): test_ECB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "AES", "ECB"), @@ -97,7 +97,7 @@ class TestAES_ECB(object): skip_message="Does not support AES OFB", ) @pytest.mark.cipher -class TestAES_OFB(object): +class TestAESModeOFB(object): test_OFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "AES", "OFB"), @@ -130,7 +130,7 @@ class TestAES_OFB(object): skip_message="Does not support AES CFB", ) @pytest.mark.cipher -class TestAES_CFB(object): +class TestAESModeCFB(object): test_CFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "AES", "CFB"), @@ -163,7 +163,7 @@ class TestAES_CFB(object): skip_message="Does not support AES CTR", ) @pytest.mark.cipher -class TestAES_CTR(object): +class TestAESModeCTR(object): test_CTR = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "AES", "CTR"), @@ -180,7 +180,7 @@ class TestAES_CTR(object): skip_message="Does not support AES GCM", ) @pytest.mark.cipher -class TestAES_GCM(object): +class TestAESModeGCM(object): test_GCM = generate_aead_test( load_nist_vectors, os.path.join("ciphers", "AES", "GCM"), |