diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-08 11:09:49 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-08 11:09:49 -0400 |
| commit | bf2a9d9545f39ad0dd9b9c9c4aa2f7f2b5669f0f (patch) | |
| tree | 083cc465c6fabdb61ff69aadc33b31e8617f2136 /tests/hazmat/primitives/test_blowfish.py | |
| parent | dee5c25d35c53885698bca42015c9f7bbfb27baa (diff) | |
| parent | 78c2f2d2c0a40d20edcaf37c33e91224af3ecbb6 (diff) | |
| download | cryptography-bf2a9d9545f39ad0dd9b9c9c4aa2f7f2b5669f0f.tar.gz cryptography-bf2a9d9545f39ad0dd9b9c9c4aa2f7f2b5669f0f.tar.bz2 cryptography-bf2a9d9545f39ad0dd9b9c9c4aa2f7f2b5669f0f.zip | |
Merge branch 'master' into idea-bespoke-vectors
* master: (246 commits)
Fixed python3 incompatibility
Removed dependency on setuptools for version check
don't need to move these definitions
conditional NIDs for 0.9.8e
x509 changes for 0.9.8e support
more changes for 0.9.8e support, this time in the ssl.h headers
macro switches in evp for 0.9.8e
bind some error constants conditionally for 0.9.8e support
BIO macro switch for 0.9.8e support
move some nids
conditionally bind AES_wrap/unwrap for 0.9.8e support
Add GPG key fingerprint for lvh
change comparison to be easier to read
ridiculous workaround time
whoops
Missing imports
Convert stuff
Add binding for DSA_new
Fix drop in coverage levels by removing branches
Added check to turn of CC backend for OS X version < 10.8
...
Conflicts:
docs/development/test-vectors.rst
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"), |