diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-13 12:49:27 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-13 12:49:27 -0500 |
commit | 0f696fab0e012bca0b69f2c933c679f5ecbe80ad (patch) | |
tree | 96d5ed3979e735548b0e3ec6a59f5017d820526b /tests/hazmat/primitives | |
parent | 723cc3f2ed921c01168ea8f35ca7e94f2cc0a44b (diff) | |
parent | 2636e4abd54140a26cf8f0793d1be16d9458e032 (diff) | |
download | cryptography-0f696fab0e012bca0b69f2c933c679f5ecbe80ad.tar.gz cryptography-0f696fab0e012bca0b69f2c933c679f5ecbe80ad.tar.bz2 cryptography-0f696fab0e012bca0b69f2c933c679f5ecbe80ad.zip |
Merge pull request #1658 from reaperhulk/move-hash-interfaces
Move hash interfaces
Diffstat (limited to 'tests/hazmat/primitives')
-rw-r--r-- | tests/hazmat/primitives/test_hashes.py | 4 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_hmac.py | 4 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_pbkdf2hmac.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index d4bf6229..d6fd727d 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -13,14 +13,14 @@ import six from cryptography import utils from cryptography.exceptions import AlreadyFinalized, _Reasons from cryptography.hazmat.backends.interfaces import HashBackend -from cryptography.hazmat.primitives import hashes, interfaces +from cryptography.hazmat.primitives import hashes from .utils import generate_base_hash_test from ..backends.test_multibackend import DummyHashBackend from ...utils import raises_unsupported_algorithm -@utils.register_interface(interfaces.HashAlgorithm) +@utils.register_interface(hashes.HashAlgorithm) class UnsupportedDummyHash(object): name = "unsupported-dummy-hash" block_size = None diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py index e31ddc8e..acd03323 100644 --- a/tests/hazmat/primitives/test_hmac.py +++ b/tests/hazmat/primitives/test_hmac.py @@ -15,14 +15,14 @@ from cryptography.exceptions import ( AlreadyFinalized, InvalidSignature, _Reasons ) from cryptography.hazmat.backends.interfaces import HMACBackend -from cryptography.hazmat.primitives import hashes, hmac, interfaces +from cryptography.hazmat.primitives import hashes, hmac from .utils import generate_base_hmac_test from ..backends.test_multibackend import DummyHMACBackend from ...utils import raises_unsupported_algorithm -@utils.register_interface(interfaces.HashAlgorithm) +@utils.register_interface(hashes.HashAlgorithm) class UnsupportedDummyHash(object): name = "unsupported-dummy-hash" block_size = None diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py index caa6a852..df49d23c 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac.py @@ -13,13 +13,13 @@ from cryptography.exceptions import ( AlreadyFinalized, InvalidKey, _Reasons ) from cryptography.hazmat.backends import default_backend -from cryptography.hazmat.primitives import hashes, interfaces +from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC from ...utils import raises_unsupported_algorithm -@utils.register_interface(interfaces.HashAlgorithm) +@utils.register_interface(hashes.HashAlgorithm) class DummyHash(object): name = "dummy-hash" block_size = None |