diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-22 15:09:34 -0700 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-03-27 07:31:12 +0000 |
| commit | 7a489dbd116edd4ca5a6104b74748f3a4f712d15 (patch) | |
| tree | 03b1fc8cdcde0e7c1032495d7d3b947540b931ad /tests/hazmat/primitives/test_pbkdf2hmac.py | |
| parent | 844c14a15884fb60871640576e30a61e6c4c2db1 (diff) | |
| download | cryptography-7a489dbd116edd4ca5a6104b74748f3a4f712d15.tar.gz cryptography-7a489dbd116edd4ca5a6104b74748f3a4f712d15.tar.bz2 cryptography-7a489dbd116edd4ca5a6104b74748f3a4f712d15.zip | |
Fixed #809 -- switch back to always using UnsupportedAlgorithm
Diffstat (limited to 'tests/hazmat/primitives/test_pbkdf2hmac.py')
| -rw-r--r-- | tests/hazmat/primitives/test_pbkdf2hmac.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py index 585693ea..ebc5fbf5 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac.py @@ -18,7 +18,7 @@ import six from cryptography import utils from cryptography.exceptions import ( - AlreadyFinalized, InvalidKey, UnsupportedHash, UnsupportedInterface + AlreadyFinalized, InvalidKey, UnsupportedAlgorithm ) from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes, interfaces @@ -48,7 +48,7 @@ class TestPBKDF2HMAC(object): kdf.verify(b"password", key) def test_unsupported_algorithm(self): - with pytest.raises(UnsupportedHash): + with pytest.raises(UnsupportedAlgorithm): PBKDF2HMAC(DummyHash(), 20, b"salt", 10, default_backend()) def test_invalid_key(self): @@ -72,5 +72,5 @@ class TestPBKDF2HMAC(object): def test_invalid_backend(): pretend_backend = object() - with pytest.raises(UnsupportedInterface): + with pytest.raises(UnsupportedAlgorithm): PBKDF2HMAC(hashes.SHA1(), 20, b"salt", 10, pretend_backend) |