diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-20 18:43:04 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-20 18:43:04 -0400 |
| commit | cdd0d2f045816f007a44d56691a023dd25bcb47a (patch) | |
| tree | a81524d68aa5af550a69772e94c22977d2811d29 /tests/hazmat/primitives/test_pbkdf2hmac.py | |
| parent | 798c03456d6f1fa8f27433a7e3928d583e1e120f (diff) | |
| parent | 23c641dad201446a019d4a5f1181908744fd347a (diff) | |
| download | cryptography-cdd0d2f045816f007a44d56691a023dd25bcb47a.tar.gz cryptography-cdd0d2f045816f007a44d56691a023dd25bcb47a.tar.bz2 cryptography-cdd0d2f045816f007a44d56691a023dd25bcb47a.zip | |
Merge branch 'master' into rsa-pss-signing
* master:
add mgf1_hash_supported unsupported hash check
more concise way of generating tests
switch to a lambda
rename some things
add FIPS 186-2/3 signature verification tests for RSA PKCSv15 and PSS
revert one import order change
a few small fixes
Add ASN1_TIME_free
import order fixes for future automated checking
Conflicts:
tests/hazmat/primitives/test_rsa.py
tests/hazmat/primitives/utils.py
Diffstat (limited to 'tests/hazmat/primitives/test_pbkdf2hmac.py')
| -rw-r--r-- | tests/hazmat/primitives/test_pbkdf2hmac.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py index bf1e7f14..585693ea 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac.py @@ -18,11 +18,11 @@ import six from cryptography import utils from cryptography.exceptions import ( - InvalidKey, UnsupportedHash, AlreadyFinalized, UnsupportedInterface + AlreadyFinalized, InvalidKey, UnsupportedHash, UnsupportedInterface ) +from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes, interfaces from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC -from cryptography.hazmat.backends import default_backend @utils.register_interface(interfaces.HashAlgorithm) |