diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-12 12:51:00 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-13 08:38:06 -0600 |
| commit | 601278a17617e5aa631d6395320340f4df3641b2 (patch) | |
| tree | 4e1ba797bc42ca5c1f7a17df98ec407199b2cb5a /tests/hazmat | |
| parent | 723cc3f2ed921c01168ea8f35ca7e94f2cc0a44b (diff) | |
| download | cryptography-601278a17617e5aa631d6395320340f4df3641b2.tar.gz cryptography-601278a17617e5aa631d6395320340f4df3641b2.tar.bz2 cryptography-601278a17617e5aa631d6395320340f4df3641b2.zip | |
move hash interfaces
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 2 | ||||
| -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 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 5b5c7bd7..97d58085 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -49,7 +49,7 @@ class DummyPadding(object): name = "dummy-cipher" -@utils.register_interface(interfaces.HashAlgorithm) +@utils.register_interface(hashes.HashAlgorithm) class DummyHash(object): name = "dummy-hash" block_size = None 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 |