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/backends | |
| 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/backends')
| -rw-r--r-- | tests/hazmat/backends/test_commoncrypto.py | 2 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py index b79c02e0..6bb0ede0 100644 --- a/tests/hazmat/backends/test_commoncrypto.py +++ b/tests/hazmat/backends/test_commoncrypto.py @@ -30,7 +30,7 @@ from ...utils import raises_unsupported_algorithm class DummyCipher(object): name = "dummy-cipher" block_size = 128 - key_size = 128 + digest_size = None @pytest.mark.skipif("commoncrypto" not in diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 65113f1a..ebd8686c 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -52,7 +52,7 @@ class DummyMode(object): @utils.register_interface(interfaces.CipherAlgorithm) class DummyCipher(object): name = "dummy-cipher" - key_size = 128 + key_size = None @utils.register_interface(interfaces.AsymmetricPadding) @@ -63,8 +63,8 @@ class DummyPadding(object): @utils.register_interface(interfaces.HashAlgorithm) class DummyHash(object): name = "dummy-hash" - block_size = 128 - digest_size = 128 + block_size = None + digest_size = None class DummyMGF(object): |