diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-17 07:34:23 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-17 07:34:23 -0800 |
| commit | 0be5ef955146a05d4c6e9368dcb4c8aeb3d4772e (patch) | |
| tree | b43d9305204000b03b367593caaebf9fd2d43fed /src/cryptography/hazmat/primitives/kdf/pbkdf2.py | |
| parent | 42de05cbf5b91a3c3c20158eb387b7c7dc6e8dd0 (diff) | |
| parent | 48402ffeef3224452d042f4b349c9d2c16ff2852 (diff) | |
| download | cryptography-0be5ef955146a05d4c6e9368dcb4c8aeb3d4772e.tar.gz cryptography-0be5ef955146a05d4c6e9368dcb4c8aeb3d4772e.tar.bz2 cryptography-0be5ef955146a05d4c6e9368dcb4c8aeb3d4772e.zip | |
Merge pull request #1668 from reaperhulk/move-kdf-interfaces
move KDF interface
Diffstat (limited to 'src/cryptography/hazmat/primitives/kdf/pbkdf2.py')
| -rw-r--r-- | src/cryptography/hazmat/primitives/kdf/pbkdf2.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/primitives/kdf/pbkdf2.py b/src/cryptography/hazmat/primitives/kdf/pbkdf2.py index 3d565be2..f8ce7a3b 100644 --- a/src/cryptography/hazmat/primitives/kdf/pbkdf2.py +++ b/src/cryptography/hazmat/primitives/kdf/pbkdf2.py @@ -9,10 +9,11 @@ from cryptography.exceptions import ( AlreadyFinalized, InvalidKey, UnsupportedAlgorithm, _Reasons ) from cryptography.hazmat.backends.interfaces import PBKDF2HMACBackend -from cryptography.hazmat.primitives import constant_time, interfaces +from cryptography.hazmat.primitives import constant_time +from cryptography.hazmat.primitives.kdf import KeyDerivationFunction -@utils.register_interface(interfaces.KeyDerivationFunction) +@utils.register_interface(KeyDerivationFunction) class PBKDF2HMAC(object): def __init__(self, algorithm, length, salt, iterations, backend): if not isinstance(backend, PBKDF2HMACBackend): |