diff options
author | David Reid <dreid@dreid.org> | 2013-11-13 10:41:28 -0800 |
---|---|---|
committer | David Reid <dreid@dreid.org> | 2013-11-13 10:41:28 -0800 |
commit | 2d45bc3295c62e09dd06f19e206735e374bddd61 (patch) | |
tree | f8949a7ebe891bbaa183cda6146314e67708133d /tests/hazmat/primitives/test_camellia.py | |
parent | 4826ec6e7602a3d2bca687afadb97a04a5e85ff2 (diff) | |
parent | e5aa205070877852ff2d54eebcc0d4ac9cf8465e (diff) | |
download | cryptography-2d45bc3295c62e09dd06f19e206735e374bddd61.tar.gz cryptography-2d45bc3295c62e09dd06f19e206735e374bddd61.tar.bz2 cryptography-2d45bc3295c62e09dd06f19e206735e374bddd61.zip |
Merge pull request #255 from alex/remove-backends
Remove the hash and hmac specific classes, now that the logic is the Con...
Diffstat (limited to 'tests/hazmat/primitives/test_camellia.py')
-rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index 223269a2..a2c935d9 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -35,7 +35,7 @@ class TestCamellia(object): ], lambda key: algorithms.Camellia(binascii.unhexlify((key))), lambda key: modes.ECB(), - only_if=lambda backend: backend.ciphers.supported( + only_if=lambda backend: backend.cipher_supported( algorithms.Camellia("\x00" * 16), modes.ECB() ), skip_message="Does not support Camellia ECB", @@ -47,7 +47,7 @@ class TestCamellia(object): ["camellia-cbc.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CBC(binascii.unhexlify(iv)), - only_if=lambda backend: backend.ciphers.supported( + only_if=lambda backend: backend.cipher_supported( algorithms.Camellia("\x00" * 16), modes.CBC("\x00" * 16) ), skip_message="Does not support Camellia CBC", @@ -59,7 +59,7 @@ class TestCamellia(object): ["camellia-ofb.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.OFB(binascii.unhexlify(iv)), - only_if=lambda backend: backend.ciphers.supported( + only_if=lambda backend: backend.cipher_supported( algorithms.Camellia("\x00" * 16), modes.OFB("\x00" * 16) ), skip_message="Does not support Camellia OFB", @@ -71,7 +71,7 @@ class TestCamellia(object): ["camellia-cfb.txt"], lambda key, iv: algorithms.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CFB(binascii.unhexlify(iv)), - only_if=lambda backend: backend.ciphers.supported( + only_if=lambda backend: backend.cipher_supported( algorithms.Camellia("\x00" * 16), modes.CFB("\x00" * 16) ), skip_message="Does not support Camellia CFB", |