diff options
| -rw-r--r-- | cryptography/hazmat/primitives/kdf/hkdf.py | 11 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_hkdf.py | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/cryptography/hazmat/primitives/kdf/hkdf.py b/cryptography/hazmat/primitives/kdf/hkdf.py index ae24f676..c98a31c2 100644 --- a/cryptography/hazmat/primitives/kdf/hkdf.py +++ b/cryptography/hazmat/primitives/kdf/hkdf.py @@ -13,12 +13,9 @@ import six -from cryptography import exceptions from cryptography import utils - -from cryptography.hazmat.primitives import constant_time -from cryptography.hazmat.primitives import hmac -from cryptography.hazmat.primitives import interfaces +from cryptogrpahy.exceptions import AlreadyFinalized, InvalidKey +from cryptography.hazmat.primitives import constant_time, hmac, interfaces @utils.register_interface(interfaces.KeyDerivationFunction) @@ -84,11 +81,11 @@ class HKDF(object): ) if self._used: - raise exceptions.AlreadyFinalized + raise AlreadyFinalized self._used = True return self._expand(self._extract(key_material)) def verify(self, key_material, expected_key): if not constant_time.bytes_eq(self.derive(key_material), expected_key): - raise exceptions.InvalidKey + raise InvalidKey diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py index 66993f0e..0b7fa9b5 100644 --- a/tests/hazmat/primitives/test_hkdf.py +++ b/tests/hazmat/primitives/test_hkdf.py @@ -17,7 +17,7 @@ import six import pytest -from cryptography import exceptions +from cryptography.exceptions import AlreadyFinalized, from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.kdf.hkdf import HKDF @@ -47,7 +47,7 @@ class TestHKDF(object): hkdf.derive(b"\x01" * 16) - with pytest.raises(exceptions.AlreadyFinalized): + with pytest.raises(AlreadyFinalized): hkdf.derive(b"\x02" * 16) hkdf = HKDF( @@ -60,7 +60,7 @@ class TestHKDF(object): hkdf.verify(b"\x01" * 16, b"gJ\xfb{\xb1Oi\xc5sMC\xb7\xe4@\xf7u") - with pytest.raises(exceptions.AlreadyFinalized): + with pytest.raises(AlreadyFinalized): hkdf.verify(b"\x02" * 16, b"gJ\xfb{\xb1Oi\xc5sMC\xb7\xe4@\xf7u") hkdf = HKDF( @@ -91,7 +91,7 @@ class TestHKDF(object): backend=backend ) - with pytest.raises(exceptions.InvalidKey): + with pytest.raises(InvalidKey): hkdf.verify(b"\x02" * 16, b"gJ\xfb{\xb1Oi\xc5sMC\xb7\xe4@\xf7u") def test_unicode_typeerror(self, backend): |