Merge branch 'master' into fernet

1 files changed, 0 insertions, 44 deletions

diff --git a/tests/hazmat/primitives/test_cryptrec.py b/tests/hazmat/primitives/test_cryptrec.py
deleted file mode 100644
index 48f64a27..00000000
--- a/tests/hazmat/primitives/test_cryptrec.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-
-
-class TestCamelliaECB(object):
-    test_NTT = generate_encrypt_test(
-        load_cryptrec_vectors_from_file,
-        os.path.join("Camellia", "NTT"),
-        [
-            "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",
-    )