From 47185e87a3fbad72e44542537878477e786cd49e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 15 Feb 2014 22:04:57 -0600 Subject: reformat camellia cfb, ofb, cbc vectors to NIST layout + remove duplicate tests --- tests/hazmat/primitives/test_camellia.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/hazmat/primitives/test_camellia.py') 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)), -- cgit v1.2.3 From 6e6a6ff5ae12a9dd47a806dd0929fb445d7e01ac Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 24 Feb 2014 13:16:11 -0600 Subject: updates to make the project pep8-naming clean --- tests/hazmat/primitives/test_camellia.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/hazmat/primitives/test_camellia.py') diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index 4b3a67c5..25bd0ff9 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -33,7 +33,7 @@ from ...utils import ( skip_message="Does not support Camellia ECB", ) @pytest.mark.cipher -class TestCamellia_ECB(object): +class TestCamelliaModeECB(object): test_ECB = generate_encrypt_test( load_cryptrec_vectors, os.path.join("ciphers", "Camellia"), @@ -54,7 +54,7 @@ class TestCamellia_ECB(object): skip_message="Does not support Camellia CBC", ) @pytest.mark.cipher -class TestCamellia_CBC(object): +class TestCamelliaModeCBC(object): test_CBC = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), @@ -71,7 +71,7 @@ class TestCamellia_CBC(object): skip_message="Does not support Camellia OFB", ) @pytest.mark.cipher -class TestCamellia_OFB(object): +class TestCamelliaModeOFB(object): test_OFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), @@ -88,7 +88,7 @@ class TestCamellia_OFB(object): skip_message="Does not support Camellia CFB", ) @pytest.mark.cipher -class TestCamellia_CFB(object): +class TestCamelliaModeCFB(object): test_CFB = generate_encrypt_test( load_nist_vectors, os.path.join("ciphers", "Camellia"), -- cgit v1.2.3