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_cast5.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_cast5.py')
| -rw-r--r-- | tests/hazmat/primitives/test_cast5.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py index 21119286..60228299 100644 --- a/tests/hazmat/primitives/test_cast5.py +++ b/tests/hazmat/primitives/test_cast5.py @@ -31,7 +31,7 @@ from ...utils import load_nist_vectors skip_message="Does not support CAST5 ECB", ) @pytest.mark.cipher -class TestCAST5_ECB(object): +class TestCAST5ModeECB(object): test_ECB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "CAST5"), @@ -48,7 +48,7 @@ class TestCAST5_ECB(object): skip_message="Does not support CAST5 CBC", ) @pytest.mark.cipher -class TestCAST5_CBC(object): +class TestCAST5ModeCBC(object): test_CBC = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "CAST5"), @@ -65,7 +65,7 @@ class TestCAST5_CBC(object): skip_message="Does not support CAST5 OFB", ) @pytest.mark.cipher -class TestCAST5_OFB(object): +class TestCAST5ModeOFB(object): test_OFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "CAST5"), @@ -82,7 +82,7 @@ class TestCAST5_OFB(object): skip_message="Does not support CAST5 CFB", ) @pytest.mark.cipher -class TestCAST5_CFB(object): +class TestCAST5ModeCFB(object): test_CFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "CAST5"), @@ -99,7 +99,7 @@ class TestCAST5_CFB(object): skip_message="Does not support CAST5 CTR", ) @pytest.mark.cipher -class TestCAST5_CTR(object): +class TestCAST5ModeCTR(object): test_CTR = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "CAST5"), |