diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-21 15:40:12 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-21 15:40:12 -0700 |
commit | 9f79164a8d7d5004884b455d07c2ab1b111d037e (patch) | |
tree | 535c2ddadea2bcffa5f99372d1cde65b91d4778b /tests/primitives/test_cryptrec.py | |
parent | ef2f91e6fe694be91ce3a0a37ebaf58d89bb5985 (diff) | |
parent | c160079df8dd021b6b1e8091025ba27ddc6cd6c0 (diff) | |
download | cryptography-9f79164a8d7d5004884b455d07c2ab1b111d037e.tar.gz cryptography-9f79164a8d7d5004884b455d07c2ab1b111d037e.tar.bz2 cryptography-9f79164a8d7d5004884b455d07c2ab1b111d037e.zip |
Merge branch 'master' into triple-des
Diffstat (limited to 'tests/primitives/test_cryptrec.py')
-rw-r--r-- | tests/primitives/test_cryptrec.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/primitives/test_cryptrec.py b/tests/primitives/test_cryptrec.py index edf97652..02a04473 100644 --- a/tests/primitives/test_cryptrec.py +++ b/tests/primitives/test_cryptrec.py @@ -37,6 +37,8 @@ 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", ) |