aboutsummaryrefslogtreecommitdiffstats
path: root/tests/primitives/test_cryptrec.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-21 22:06:41 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-21 22:06:41 -0500
commit9f7ea6e232e5e319a2bfc6bab8d88455947b4901 (patch)
treecddf176070c0a7589c4203eb2a88c47d0b99ea7f /tests/primitives/test_cryptrec.py
parent653463f0e133def71425a26fdd80bfe7c8ad5961 (diff)
parentc160079df8dd021b6b1e8091025ba27ddc6cd6c0 (diff)
downloadcryptography-9f7ea6e232e5e319a2bfc6bab8d88455947b4901.tar.gz
cryptography-9f7ea6e232e5e319a2bfc6bab8d88455947b4901.tar.bz2
cryptography-9f7ea6e232e5e319a2bfc6bab8d88455947b4901.zip
Merge branch 'master' into block-cipher-decrypt
Diffstat (limited to 'tests/primitives/test_cryptrec.py')
-rw-r--r--tests/primitives/test_cryptrec.py4
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",
)