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_3des.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_3des.py')
| -rw-r--r-- | tests/hazmat/primitives/test_3des.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_3des.py b/tests/hazmat/primitives/test_3des.py index 581c47eb..a4d696c9 100644 --- a/tests/hazmat/primitives/test_3des.py +++ b/tests/hazmat/primitives/test_3des.py @@ -35,7 +35,7 @@ from ...utils import load_nist_vectors skip_message="Does not support TripleDES CBC", ) @pytest.mark.cipher -class TestTripleDES_CBC(object): +class TestTripleDESModeCBC(object): test_KAT = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "3DES", "CBC"), @@ -72,7 +72,7 @@ class TestTripleDES_CBC(object): skip_message="Does not support TripleDES OFB", ) @pytest.mark.cipher -class TestTripleDES_OFB(object): +class TestTripleDESModeOFB(object): test_KAT = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "3DES", "OFB"), @@ -109,7 +109,7 @@ class TestTripleDES_OFB(object): skip_message="Does not support TripleDES CFB", ) @pytest.mark.cipher -class TestTripleDES_CFB(object): +class TestTripleDESModeCFB(object): test_KAT = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "3DES", "CFB"), |