diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 16:42:15 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 16:42:15 -0600 |
| commit | b3f763f1beae2a5fa1fdd3c27b6e9cb777ce7f50 (patch) | |
| tree | 71f43c04e7ef8bcea0ae29fbee14b78bc05841e3 /cryptography | |
| parent | 98e40e658ef00dc6972f5420896bd57b385c8435 (diff) | |
| download | cryptography-b3f763f1beae2a5fa1fdd3c27b6e9cb777ce7f50.tar.gz cryptography-b3f763f1beae2a5fa1fdd3c27b6e9cb777ce7f50.tar.bz2 cryptography-b3f763f1beae2a5fa1fdd3c27b6e9cb777ce7f50.zip | |
finish PBKDF2HMAC rename, more docs
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/primitives/kdf/pbkdf2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptography/hazmat/primitives/kdf/pbkdf2.py b/cryptography/hazmat/primitives/kdf/pbkdf2.py index 940d9910..a496cc27 100644 --- a/cryptography/hazmat/primitives/kdf/pbkdf2.py +++ b/cryptography/hazmat/primitives/kdf/pbkdf2.py @@ -23,7 +23,7 @@ from cryptography.hazmat.primitives import constant_time, interfaces @utils.register_interface(interfaces.KeyDerivationFunction) class PBKDF2HMAC(object): def __init__(self, algorithm, length, salt, iterations, backend): - if not backend.pbkdf2_hash_supported(algorithm): + if not backend.pbkdf2_hmac_supported(algorithm): raise UnsupportedAlgorithm( "{0} is not supported for PBKDF2 by this backend".format( algorithm.name) @@ -40,7 +40,7 @@ class PBKDF2HMAC(object): raise AlreadyFinalized("PBKDF2 instances can only be called once") else: self._called = True - return self._backend.derive_pbkdf2( + return self._backend.derive_pbkdf2_hmac( self.algorithm, self._length, self._salt, |