diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 18:00:50 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 18:00:50 -0700 |
| commit | 8ee102762525ff7619bc5b9c16f53f4c8537abfc (patch) | |
| tree | 1b30ed1d1a45895c0f979c1869b9b6386213890c /tests | |
| parent | 169dee88faa7c46b5551b89cf97a1b30c0a1c6ea (diff) | |
| download | cryptography-8ee102762525ff7619bc5b9c16f53f4c8537abfc.tar.gz cryptography-8ee102762525ff7619bc5b9c16f53f4c8537abfc.tar.bz2 cryptography-8ee102762525ff7619bc5b9c16f53f4c8537abfc.zip | |
Refactor how cipher names are computed
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bindings/test_openssl.py | 2 | ||||
| -rw-r--r-- | tests/primitives/test_cryptrec.py | 2 | ||||
| -rw-r--r-- | tests/primitives/test_openssl_vectors.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/bindings/test_openssl.py b/tests/bindings/test_openssl.py index e5b78d18..2d513308 100644 --- a/tests/bindings/test_openssl.py +++ b/tests/bindings/test_openssl.py @@ -30,4 +30,4 @@ class TestOpenSSL(object): assert api.openssl_version_text().startswith("OpenSSL") def test_supports_cipher(self): - assert api.supports_cipher("not-a-real-cipher") is False + assert api.supports_cipher(None, None) is False diff --git a/tests/primitives/test_cryptrec.py b/tests/primitives/test_cryptrec.py index edf97652..56eca3a1 100644 --- a/tests/primitives/test_cryptrec.py +++ b/tests/primitives/test_cryptrec.py @@ -37,6 +37,6 @@ class TestCamelliaECB(object): ], lambda key: ciphers.Camellia(binascii.unhexlify((key))), lambda key: modes.ECB(), - only_if=lambda api: api.supports_cipher("camellia-128-ecb"), + only_if=lambda api: api.supports_cipher(ciphers.Camellia("\x00" * 16), modes.ECB()), skip_message="Does not support Camellia ECB", ) diff --git a/tests/primitives/test_openssl_vectors.py b/tests/primitives/test_openssl_vectors.py index 6e32eca6..f53ade8e 100644 --- a/tests/primitives/test_openssl_vectors.py +++ b/tests/primitives/test_openssl_vectors.py @@ -32,7 +32,7 @@ class TestCamelliaCBC(object): ["camellia-cbc.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CBC(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-cbc"), + only_if=lambda api: api.supports_cipher(ciphers.Camellia("\x00" * 16), modes.CBC("\x00" * 16)), skip_message="Does not support Camellia CBC", ) @@ -44,7 +44,7 @@ class TestCamelliaOFB(object): ["camellia-ofb.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.OFB(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-ofb"), + only_if=lambda api: api.supports_cipher(ciphers.Camellia("\x00" * 16), modes.OFB("\x00" * 16)), skip_message="Does not support Camellia OFB", ) @@ -56,6 +56,6 @@ class TestCamelliaCFB(object): ["camellia-cfb.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CFB(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-cfb"), + only_if=lambda api: api.supports_cipher(ciphers.Camellia("\x00" * 16), modes.CFB("\x00" * 16)), skip_message="Does not support Camellia CFB", ) |