diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 08:45:31 -0600 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 08:45:31 -0600 |
commit | 4b3326eef8e5b2694609701e4fdbdd58cbf96c99 (patch) | |
tree | b0725c7195ff528e1a118f1e0df618dec8b65ef7 /cryptography/hazmat/primitives/hmac.py | |
parent | be91a92cddf6fc54bc6069b2299a650a2edad104 (diff) | |
parent | e60e1d782cb7c1abe68811092f7db342ed14b81f (diff) | |
download | cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.tar.gz cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.tar.bz2 cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.zip |
Merge branch 'master' into fernet
Diffstat (limited to 'cryptography/hazmat/primitives/hmac.py')
-rw-r--r-- | cryptography/hazmat/primitives/hmac.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cryptography/hazmat/primitives/hmac.py b/cryptography/hazmat/primitives/hmac.py index 08dfae01..618bccc5 100644 --- a/cryptography/hazmat/primitives/hmac.py +++ b/cryptography/hazmat/primitives/hmac.py @@ -22,15 +22,11 @@ from cryptography.hazmat.primitives import interfaces @utils.register_interface(interfaces.HashContext) class HMAC(object): - def __init__(self, key, algorithm, ctx=None, backend=None): + def __init__(self, key, algorithm, backend, ctx=None): if not isinstance(algorithm, interfaces.HashAlgorithm): raise TypeError("Expected instance of interfaces.HashAlgorithm.") self.algorithm = algorithm - if backend is None: - from cryptography.hazmat.bindings import _default_backend - backend = _default_backend - self._backend = backend self._key = key if ctx is None: |