diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:22 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:22 -0700 |
| commit | 6183977b8bcad36902c7ce73f63771a4efdee83f (patch) | |
| tree | ddce33059c217608385eb63addcf1bc43cfc1987 /tests/hazmat/primitives/test_camellia.py | |
| parent | 0e5fd074b79f6dc86bcc643772b731594bcbb011 (diff) | |
| parent | ff7ac75cc766b0483c7de25986f1c59d496ba68c (diff) | |
| download | cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.tar.gz cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.tar.bz2 cryptography-6183977b8bcad36902c7ce73f63771a4efdee83f.zip | |
Merge pull request #205 from reaperhulk/simplify-tests
Simplify some test class structure
Diffstat (limited to 'tests/hazmat/primitives/test_camellia.py')
| -rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index 46e724bb..605c18d5 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -11,10 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -""" -Tests using the CRYPTREC (Camellia) Test Vectors -""" - from __future__ import absolute_import, division, print_function import binascii @@ -28,7 +24,7 @@ from ...utils import ( ) -class TestCamelliaECB(object): +class TestCamellia(object): test_ECB = generate_encrypt_test( load_cryptrec_vectors_from_file, os.path.join("ciphers", "Camellia"), @@ -45,8 +41,6 @@ class TestCamelliaECB(object): skip_message="Does not support Camellia ECB", ) - -class TestCamelliaCBC(object): test_CBC = generate_encrypt_test( load_openssl_vectors_from_file, os.path.join("ciphers", "Camellia"), @@ -59,8 +53,6 @@ class TestCamelliaCBC(object): skip_message="Does not support Camellia CBC", ) - -class TestCamelliaOFB(object): test_OFB = generate_encrypt_test( load_openssl_vectors_from_file, os.path.join("ciphers", "Camellia"), @@ -73,8 +65,6 @@ class TestCamelliaOFB(object): skip_message="Does not support Camellia OFB", ) - -class TestCamelliaCFB(object): test_CFB = generate_encrypt_test( load_openssl_vectors_from_file, os.path.join("ciphers", "Camellia"), |