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_camellia.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_camellia.py')
| -rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index 4b3a67c5..25bd0ff9 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -33,7 +33,7 @@ from ...utils import ( skip_message="Does not support Camellia ECB", ) @pytest.mark.cipher -class TestCamellia_ECB(object): +class TestCamelliaModeECB(object): test_ECB = generate_encrypt_test( load_cryptrec_vectors, os.path.join("ciphers", "Camellia"), @@ -54,7 +54,7 @@ class TestCamellia_ECB(object): skip_message="Does not support Camellia CBC", ) @pytest.mark.cipher -class TestCamellia_CBC(object): +class TestCamelliaModeCBC(object): test_CBC = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), @@ -71,7 +71,7 @@ class TestCamellia_CBC(object): skip_message="Does not support Camellia OFB", ) @pytest.mark.cipher -class TestCamellia_OFB(object): +class TestCamelliaModeOFB(object): test_OFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), @@ -88,7 +88,7 @@ class TestCamellia_OFB(object): skip_message="Does not support Camellia CFB", ) @pytest.mark.cipher -class TestCamellia_CFB(object): +class TestCamelliaModeCFB(object): test_CFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), |