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_blowfish.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_blowfish.py')
| -rw-r--r-- | tests/hazmat/primitives/test_blowfish.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_blowfish.py b/tests/hazmat/primitives/test_blowfish.py index 18512a6e..2801f430 100644 --- a/tests/hazmat/primitives/test_blowfish.py +++ b/tests/hazmat/primitives/test_blowfish.py @@ -31,7 +31,7 @@ from ...utils import load_nist_vectors skip_message="Does not support Blowfish ECB", ) @pytest.mark.cipher -class TestBlowfish_ECB(object): +class TestBlowfishModeECB(object): test_ECB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Blowfish"), @@ -48,7 +48,7 @@ class TestBlowfish_ECB(object): skip_message="Does not support Blowfish CBC", ) @pytest.mark.cipher -class TestBlowfish_CBC(object): +class TestBlowfishModeCBC(object): test_CBC = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Blowfish"), @@ -65,7 +65,7 @@ class TestBlowfish_CBC(object): skip_message="Does not support Blowfish OFB", ) @pytest.mark.cipher -class TestBlowfish_OFB(object): +class TestBlowfishModeOFB(object): test_OFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Blowfish"), @@ -82,7 +82,7 @@ class TestBlowfish_OFB(object): skip_message="Does not support Blowfish CFB", ) @pytest.mark.cipher -class TestBlowfish_CFB(object): +class TestBlowfishModeCFB(object): test_CFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Blowfish"), |