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_openssl_vectors.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_openssl_vectors.py')
| -rw-r--r-- | tests/primitives/test_openssl_vectors.py | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/tests/primitives/test_openssl_vectors.py b/tests/primitives/test_openssl_vectors.py index 6e32eca6..86ff7cad 100644 --- a/tests/primitives/test_openssl_vectors.py +++ b/tests/primitives/test_openssl_vectors.py @@ -32,7 +32,9 @@ 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 +46,9 @@ 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 +60,22 @@ 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", ) + + +class TestAESCTR(object): + test_OpenSSL = generate_encrypt_test( + load_openssl_vectors_from_file, + "AES", + ["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 api: api.supports_cipher( + ciphers.AES("\x00" * 16), modes.CTR("\x00" * 16) + ), + skip_message="Does not support AES CTR", + ) |