From 9b457dea21096ac3f170c6c49e5acda2ccbf8293 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 30 Oct 2013 09:12:56 -0500
Subject: move around the tests to organize by cipher

---
 tests/hazmat/primitives/test_camellia.py | 88 ++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 tests/hazmat/primitives/test_camellia.py

(limited to 'tests/hazmat/primitives/test_camellia.py')

diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py
new file mode 100644
index 00000000..ab321a42
--- /dev/null
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -0,0 +1,88 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# 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
+import os
+
+from cryptography.hazmat.primitives.block import ciphers, modes
+
+from .utils import generate_encrypt_test
+from ...utils import (
+    load_cryptrec_vectors_from_file, load_openssl_vectors_from_file
+)
+
+
+class TestCamelliaECB(object):
+    test_NTT = generate_encrypt_test(
+        load_cryptrec_vectors_from_file,
+        os.path.join("ciphers", "Camellia"),
+        [
+            "camellia-128-ecb.txt",
+            "camellia-192-ecb.txt",
+            "camellia-256-ecb.txt"
+        ],
+        lambda key: ciphers.Camellia(binascii.unhexlify((key))),
+        lambda key: modes.ECB(),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.Camellia("\x00" * 16), modes.ECB()
+        ),
+        skip_message="Does not support Camellia ECB",
+    )
+
+
+class TestCamelliaCBC(object):
+    test_OpenSSL = generate_encrypt_test(
+        load_openssl_vectors_from_file,
+        os.path.join("ciphers", "Camellia"),
+        ["camellia-cbc.txt"],
+        lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
+        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.Camellia("\x00" * 16), modes.CBC("\x00" * 16)
+        ),
+        skip_message="Does not support Camellia CBC",
+    )
+
+
+class TestCamelliaOFB(object):
+    test_OpenSSL = generate_encrypt_test(
+        load_openssl_vectors_from_file,
+        os.path.join("ciphers", "Camellia"),
+        ["camellia-ofb.txt"],
+        lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
+        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.Camellia("\x00" * 16), modes.OFB("\x00" * 16)
+        ),
+        skip_message="Does not support Camellia OFB",
+    )
+
+
+class TestCamelliaCFB(object):
+    test_OpenSSL = generate_encrypt_test(
+        load_openssl_vectors_from_file,
+        os.path.join("ciphers", "Camellia"),
+        ["camellia-cfb.txt"],
+        lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
+        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.Camellia("\x00" * 16), modes.CFB("\x00" * 16)
+        ),
+        skip_message="Does not support Camellia CFB",
+    )
-- 
cgit v1.2.3


From b735107f0fe9529cbef070fe50112ac2c9ed9402 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 31 Oct 2013 13:18:31 -0500
Subject: rename camellia 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 ab321a42..46e724bb 100644
--- a/tests/hazmat/primitives/test_camellia.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -29,7 +29,7 @@ from ...utils import (
 
 
 class TestCamelliaECB(object):
-    test_NTT = generate_encrypt_test(
+    test_ECB = generate_encrypt_test(
         load_cryptrec_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
         [
@@ -47,7 +47,7 @@ class TestCamelliaECB(object):
 
 
 class TestCamelliaCBC(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_CBC = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
         ["camellia-cbc.txt"],
@@ -61,7 +61,7 @@ class TestCamelliaCBC(object):
 
 
 class TestCamelliaOFB(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_OFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
         ["camellia-ofb.txt"],
@@ -75,7 +75,7 @@ class TestCamelliaOFB(object):
 
 
 class TestCamelliaCFB(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_CFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
         ["camellia-cfb.txt"],
-- 
cgit v1.2.3