aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-10-30 17:49:57 +0000
committerAlex Stapleton <alexs@prol.etari.at>2014-10-30 17:49:57 +0000
commitb438a6f2d845661fa5a03993a299ca6c5064dab0 (patch)
tree98cd593cea90bfaedb9332c6d146719aa13d93b4
parent147703e9db15f4fddf13afc354a52e9777eb2dae (diff)
parent1dbfafbdb97579ca97ffc72e16d4df4c3009fc56 (diff)
downloadcryptography-b438a6f2d845661fa5a03993a299ca6c5064dab0.tar.gz
cryptography-b438a6f2d845661fa5a03993a299ca6c5064dab0.tar.bz2
cryptography-b438a6f2d845661fa5a03993a299ca6c5064dab0.zip
Merge pull request #1453 from alex/final-test-cleanups
Make sure algorithm classes fully implement their interface
-rw-r--r--tests/hazmat/backends/test_commoncrypto.py4
-rw-r--r--tests/hazmat/backends/test_openssl.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py
index 6bb0ede0..eb61a574 100644
--- a/tests/hazmat/backends/test_commoncrypto.py
+++ b/tests/hazmat/backends/test_commoncrypto.py
@@ -29,8 +29,8 @@ from ...utils import raises_unsupported_algorithm
@utils.register_interface(interfaces.CipherAlgorithm)
class DummyCipher(object):
name = "dummy-cipher"
- block_size = 128
- digest_size = None
+ block_size = None
+ key_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 ebd8686c..bc6a2bac 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -439,8 +439,7 @@ class TestOpenSSLCMAC(object):
def test_unsupported_cipher(self):
@utils.register_interface(BlockCipherAlgorithm)
class FakeAlgorithm(object):
- def __init__(self):
- self.block_size = 64
+ block_size = 64
with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_CIPHER):
backend.create_cmac_ctx(FakeAlgorithm())