diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-16 18:29:57 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-16 18:29:57 -0800 |
| commit | 22b070cea75edb3bd56b4d847853ef3fe33b8f86 (patch) | |
| tree | f20acad04f0ee93c0da440eb88f4c3ba039fef7b /tests/hazmat/primitives/test_camellia.py | |
| parent | 3e4489ac893571505f62bb39f039c06b9901f4af (diff) | |
| parent | 47185e87a3fbad72e44542537878477e786cd49e (diff) | |
| download | cryptography-22b070cea75edb3bd56b4d847853ef3fe33b8f86.tar.gz cryptography-22b070cea75edb3bd56b4d847853ef3fe33b8f86.tar.bz2 cryptography-22b070cea75edb3bd56b4d847853ef3fe33b8f86.zip | |
Merge pull request #624 from reaperhulk/openssl-loader-time-to-die
Reformat Camellia CFB, OFB, CBC vectors
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 7c56f6f9..4b3a67c5 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -22,7 +22,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test from ...utils import ( - load_cryptrec_vectors, load_openssl_vectors + load_cryptrec_vectors, load_nist_vectors ) @@ -56,7 +56,7 @@ class TestCamellia_ECB(object): @pytest.mark.cipher class TestCamellia_CBC(object): test_CBC = generate_encrypt_test( - load_openssl_vectors, + load_nist_vectors, os.path.join("ciphers", "Camellia"), ["camellia-cbc.txt"], lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)), @@ -73,7 +73,7 @@ class TestCamellia_CBC(object): @pytest.mark.cipher class TestCamellia_OFB(object): test_OFB = generate_encrypt_test( - load_openssl_vectors, + load_nist_vectors, os.path.join("ciphers", "Camellia"), ["camellia-ofb.txt"], lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)), @@ -90,7 +90,7 @@ class TestCamellia_OFB(object): @pytest.mark.cipher class TestCamellia_CFB(object): test_CFB = generate_encrypt_test( - load_openssl_vectors, + load_nist_vectors, os.path.join("ciphers", "Camellia"), ["camellia-cfb.txt"], lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)), |