diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-28 07:48:38 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-28 07:48:38 -0700 |
| commit | 91d0ba1380c27e8a6b62be18e76536000d7006ea (patch) | |
| tree | a4b22d30963e82636bb4703067d3b46c26add37c /tests/hazmat/primitives | |
| parent | 198bb65302f710957a5f67d53389277c5ab0a58c (diff) | |
| parent | 4365b12f01b3f5f501ca4f86c59999e78980790c (diff) | |
| download | cryptography-91d0ba1380c27e8a6b62be18e76536000d7006ea.tar.gz cryptography-91d0ba1380c27e8a6b62be18e76536000d7006ea.tar.bz2 cryptography-91d0ba1380c27e8a6b62be18e76536000d7006ea.zip | |
Merge branch 'master' into verify-interfaces
Conflicts:
tests/hazmat/backends/test_commoncrypto.py
tests/hazmat/backends/test_openssl.py
tests/hazmat/primitives/test_block.py
tests/hazmat/primitives/test_hashes.py
tests/hazmat/primitives/test_hmac.py
tests/hazmat/primitives/test_pbkdf2hmac.py
Diffstat (limited to 'tests/hazmat/primitives')
| -rw-r--r-- | tests/hazmat/primitives/test_block.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/primitives/test_block.py b/tests/hazmat/primitives/test_block.py index 53b87341..14f76758 100644 --- a/tests/hazmat/primitives/test_block.py +++ b/tests/hazmat/primitives/test_block.py @@ -44,7 +44,7 @@ class DummyMode(object): @utils.register_interface(interfaces.CipherAlgorithm) class DummyCipher(object): name = "dummy-cipher" - key_size = 128 + key_size = None @pytest.mark.requires_backend_interface(interface=CipherBackend) diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index bab5bfca..4345a7f4 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -34,8 +34,8 @@ from ...utils import raises_unsupported_algorithm @utils.register_interface(interfaces.HashAlgorithm) class UnsupportedDummyHash(object): name = "unsupported-dummy-hash" - block_size = 128 - digest_size = 128 + block_size = None + digest_size = None @pytest.mark.requires_backend_interface(interface=HashBackend) diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py index 01b1cdcb..3553632c 100644 --- a/tests/hazmat/primitives/test_hmac.py +++ b/tests/hazmat/primitives/test_hmac.py @@ -33,8 +33,8 @@ from ...utils import raises_unsupported_algorithm @utils.register_interface(interfaces.HashAlgorithm) class UnsupportedDummyHash(object): name = "unsupported-dummy-hash" - block_size = 128 - digest_size = 128 + block_size = None + digest_size = None @pytest.mark.supported( diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py index fa925877..c140c14d 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac.py @@ -31,8 +31,8 @@ from ...utils import raises_unsupported_algorithm @utils.register_interface(interfaces.HashAlgorithm) class DummyHash(object): name = "dummy-hash" - block_size = 128 - digest_size = 128 + block_size = None + digest_size = None class TestPBKDF2HMAC(object): |