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_hmac_vectors.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_hmac_vectors.py')
-rw-r--r-- | tests/hazmat/primitives/test_hmac_vectors.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/hazmat/primitives/test_hmac_vectors.py b/tests/hazmat/primitives/test_hmac_vectors.py index 0792080b..2f88fb1d 100644 --- a/tests/hazmat/primitives/test_hmac_vectors.py +++ b/tests/hazmat/primitives/test_hmac_vectors.py @@ -26,7 +26,7 @@ from ...utils import load_hash_vectors skip_message="Does not support MD5", ) @pytest.mark.hmac -class TestHMAC_MD5(object): +class TestHMACMD5(object): test_hmac_md5 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -42,7 +42,7 @@ class TestHMAC_MD5(object): skip_message="Does not support SHA1", ) @pytest.mark.hmac -class TestHMAC_SHA1(object): +class TestHMACSHA1(object): test_hmac_sha1 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -58,7 +58,7 @@ class TestHMAC_SHA1(object): skip_message="Does not support SHA224", ) @pytest.mark.hmac -class TestHMAC_SHA224(object): +class TestHMACSHA224(object): test_hmac_sha224 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -74,7 +74,7 @@ class TestHMAC_SHA224(object): skip_message="Does not support SHA256", ) @pytest.mark.hmac -class TestHMAC_SHA256(object): +class TestHMACSHA256(object): test_hmac_sha256 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -90,7 +90,7 @@ class TestHMAC_SHA256(object): skip_message="Does not support SHA384", ) @pytest.mark.hmac -class TestHMAC_SHA384(object): +class TestHMACSHA384(object): test_hmac_sha384 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -106,7 +106,7 @@ class TestHMAC_SHA384(object): skip_message="Does not support SHA512", ) @pytest.mark.hmac -class TestHMAC_SHA512(object): +class TestHMACSHA512(object): test_hmac_sha512 = generate_hmac_test( load_hash_vectors, "HMAC", @@ -122,7 +122,7 @@ class TestHMAC_SHA512(object): skip_message="Does not support RIPEMD160", ) @pytest.mark.hmac -class TestHMAC_RIPEMD160(object): +class TestHMACRIPEMD160(object): test_hmac_ripemd160 = generate_hmac_test( load_hash_vectors, "HMAC", |