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_pbkdf2hmac_vectors.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_pbkdf2hmac_vectors.py')
| -rw-r--r-- | tests/hazmat/primitives/test_pbkdf2hmac_vectors.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac_vectors.py b/tests/hazmat/primitives/test_pbkdf2hmac_vectors.py index cbd4cc9d..149387be 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac_vectors.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac_vectors.py @@ -26,7 +26,7 @@ from ...utils import load_nist_vectors skip_message="Does not support SHA1 for PBKDF2HMAC", ) @pytest.mark.pbkdf2hmac -class TestPBKDF2HMAC_SHA1(object): +class TestPBKDF2HMACSHA1(object): test_pbkdf2_sha1 = generate_pbkdf2_test( load_nist_vectors, "KDF", |