split backend up (refs #170)
* Moves cipher methods into a Ciphers class and hash methods to a Hashes
class and makes them available inside Backend as pluralized
attributes.
* Shortened many of the methods since their purpose is now defined by
their container class
diff --git a/tests/bindings/test_openssl.py b/tests/bindings/test_openssl.py
index bdfbed3..6f9c9d2 100644
--- a/tests/bindings/test_openssl.py
+++ b/tests/bindings/test_openssl.py
@@ -34,8 +34,8 @@
assert backend.openssl_version_text().startswith("OpenSSL")
def test_supports_cipher(self):
- assert backend.supports_cipher(None, None) is False
+ assert backend.ciphers.supported(None, None) is False
def test_register_duplicate_cipher_adapter(self):
with pytest.raises(ValueError):
- backend.register_cipher_adapter(AES, CBC, None)
+ backend.ciphers.register_cipher_adapter(AES, CBC, None)
diff --git a/tests/primitives/test_cryptrec.py b/tests/primitives/test_cryptrec.py
index d8c9aaa..5e0b12d 100644
--- a/tests/primitives/test_cryptrec.py
+++ b/tests/primitives/test_cryptrec.py
@@ -37,7 +37,7 @@
],
lambda key: ciphers.Camellia(binascii.unhexlify((key))),
lambda key: modes.ECB(),
- only_if=lambda backend: backend.supports_cipher(
+ only_if=lambda backend: backend.ciphers.supported(
ciphers.Camellia("\x00" * 16), modes.ECB()
),
skip_message="Does not support Camellia ECB",
diff --git a/tests/primitives/test_hash_vectors.py b/tests/primitives/test_hash_vectors.py
index b42021c..e385472 100644
--- a/tests/primitives/test_hash_vectors.py
+++ b/tests/primitives/test_hash_vectors.py
@@ -30,7 +30,7 @@
"SHA1ShortMsg.rsp",
],
hashes.SHA1,
- only_if=lambda backend: backend.supports_hash(hashes.SHA1),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA1),
skip_message="Does not support SHA1",
)
@@ -44,7 +44,7 @@
"SHA224ShortMsg.rsp",
],
hashes.SHA224,
- only_if=lambda backend: backend.supports_hash(hashes.SHA224),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA224),
skip_message="Does not support SHA224",
)
@@ -58,7 +58,7 @@
"SHA256ShortMsg.rsp",
],
hashes.SHA256,
- only_if=lambda backend: backend.supports_hash(hashes.SHA256),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA256),
skip_message="Does not support SHA256",
)
@@ -72,7 +72,7 @@
"SHA384ShortMsg.rsp",
],
hashes.SHA384,
- only_if=lambda backend: backend.supports_hash(hashes.SHA384),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA384),
skip_message="Does not support SHA384",
)
@@ -86,7 +86,7 @@
"SHA512ShortMsg.rsp",
],
hashes.SHA512,
- only_if=lambda backend: backend.supports_hash(hashes.SHA512),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA512),
skip_message="Does not support SHA512",
)
@@ -99,14 +99,14 @@
"ripevectors.txt",
],
hashes.RIPEMD160,
- only_if=lambda backend: backend.supports_hash(hashes.RIPEMD160),
+ only_if=lambda backend: backend.hashes.supported(hashes.RIPEMD160),
skip_message="Does not support RIPEMD160",
)
test_RIPEMD160_long_string = generate_long_string_hash_test(
hashes.RIPEMD160,
"52783243c1697bdbe16d37f97f68f08325dc1528",
- only_if=lambda backend: backend.supports_hash(hashes.RIPEMD160),
+ only_if=lambda backend: backend.hashes.supported(hashes.RIPEMD160),
skip_message="Does not support RIPEMD160",
)
@@ -119,7 +119,7 @@
"iso-test-vectors.txt",
],
hashes.Whirlpool,
- only_if=lambda backend: backend.supports_hash(hashes.Whirlpool),
+ only_if=lambda backend: backend.hashes.supported(hashes.Whirlpool),
skip_message="Does not support Whirlpool",
)
@@ -128,7 +128,7 @@
("0c99005beb57eff50a7cf005560ddf5d29057fd86b2"
"0bfd62deca0f1ccea4af51fc15490eddc47af32bb2b"
"66c34ff9ad8c6008ad677f77126953b226e4ed8b01"),
- only_if=lambda backend: backend.supports_hash(hashes.Whirlpool),
+ only_if=lambda backend: backend.hashes.supported(hashes.Whirlpool),
skip_message="Does not support Whirlpool",
)
@@ -141,6 +141,6 @@
"rfc-1321.txt",
],
hashes.MD5,
- only_if=lambda backend: backend.supports_hash(hashes.MD5),
+ only_if=lambda backend: backend.hashes.supported(hashes.MD5),
skip_message="Does not support MD5",
)
diff --git a/tests/primitives/test_hashes.py b/tests/primitives/test_hashes.py
index 2efda05..174fd5f 100644
--- a/tests/primitives/test_hashes.py
+++ b/tests/primitives/test_hashes.py
@@ -39,17 +39,18 @@
class TestCopyHash(object):
def test_copy_backend_object(self):
- pretend_backend = pretend.stub(copy_hash_context=lambda a: "copiedctx")
+ pretend_hashes = pretend.stub(copy_ctx=lambda a: "copiedctx")
+ pretend_backend = pretend.stub(hashes=pretend_hashes)
pretend_ctx = pretend.stub()
h = hashes.SHA1(backend=pretend_backend, ctx=pretend_ctx)
assert h._backend is pretend_backend
assert h.copy()._backend is h._backend
-class TestDefaultAPISHA1(object):
+class TestDefaultBackendSHA1(object):
def test_default_backend_creation(self):
"""
- This test assumes the presence of SHA1 in the default API.
+ This test assumes the presence of SHA1 in the default backend.
"""
h = hashes.SHA1()
assert h._backend is _default_backend
@@ -60,7 +61,7 @@
hashes.SHA1,
digest_size=20,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.SHA1),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA1),
skip_message="Does not support SHA1",
)
@@ -70,7 +71,7 @@
hashes.SHA224,
digest_size=28,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.SHA224),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA224),
skip_message="Does not support SHA224",
)
@@ -80,7 +81,7 @@
hashes.SHA256,
digest_size=32,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.SHA256),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA256),
skip_message="Does not support SHA256",
)
@@ -90,7 +91,7 @@
hashes.SHA384,
digest_size=48,
block_size=128,
- only_if=lambda backend: backend.supports_hash(hashes.SHA384),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA384),
skip_message="Does not support SHA384",
)
@@ -100,7 +101,7 @@
hashes.SHA512,
digest_size=64,
block_size=128,
- only_if=lambda backend: backend.supports_hash(hashes.SHA512),
+ only_if=lambda backend: backend.hashes.supported(hashes.SHA512),
skip_message="Does not support SHA512",
)
@@ -110,7 +111,7 @@
hashes.RIPEMD160,
digest_size=20,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.RIPEMD160),
+ only_if=lambda backend: backend.hashes.supported(hashes.RIPEMD160),
skip_message="Does not support RIPEMD160",
)
@@ -120,7 +121,7 @@
hashes.Whirlpool,
digest_size=64,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.Whirlpool),
+ only_if=lambda backend: backend.hashes.supported(hashes.Whirlpool),
skip_message="Does not support Whirlpool",
)
@@ -130,6 +131,6 @@
hashes.MD5,
digest_size=16,
block_size=64,
- only_if=lambda backend: backend.supports_hash(hashes.MD5),
+ only_if=lambda backend: backend.hashes.supported(hashes.MD5),
skip_message="Does not support MD5",
)
diff --git a/tests/primitives/test_openssl_vectors.py b/tests/primitives/test_openssl_vectors.py
index ff42b16..0f242ef 100644
--- a/tests/primitives/test_openssl_vectors.py
+++ b/tests/primitives/test_openssl_vectors.py
@@ -32,7 +32,7 @@
["camellia-cbc.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
- only_if=lambda backend: backend.supports_cipher(
+ only_if=lambda backend: backend.ciphers.supported(
ciphers.Camellia("\x00" * 16), modes.CBC("\x00" * 16)
),
skip_message="Does not support Camellia CBC",
@@ -46,7 +46,7 @@
["camellia-ofb.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
- only_if=lambda backend: backend.supports_cipher(
+ only_if=lambda backend: backend.ciphers.supported(
ciphers.Camellia("\x00" * 16), modes.OFB("\x00" * 16)
),
skip_message="Does not support Camellia OFB",
@@ -60,7 +60,7 @@
["camellia-cfb.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
- only_if=lambda backend: backend.supports_cipher(
+ only_if=lambda backend: backend.ciphers.supported(
ciphers.Camellia("\x00" * 16), modes.CFB("\x00" * 16)
),
skip_message="Does not support Camellia CFB",
@@ -74,7 +74,7 @@
["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
lambda key, iv: modes.CTR(binascii.unhexlify(iv)),
- only_if=lambda backend: backend.supports_cipher(
+ only_if=lambda backend: backend.ciphers.supported(
ciphers.AES("\x00" * 16), modes.CTR("\x00" * 16)
),
skip_message="Does not support AES CTR",