Merge branch 'master' into primitive-hashes

1 files changed, 0 insertions, 256 deletions

diff --git a/tests/hazmat/primitives/test_nist.py b/tests/hazmat/primitives/test_nist.py
deleted file mode 100644
index c15afd5d..00000000
--- a/tests/hazmat/primitives/test_nist.py
+++ /dev/null
@@ -1,256 +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.
-
-"""
-Test using the NIST 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_nist_vectors_from_file
-
-
-class TestAES_CBC(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "CBCGFSbox128.rsp",
-            "CBCGFSbox192.rsp",
-            "CBCGFSbox256.rsp",
-            "CBCKeySbox128.rsp",
-            "CBCKeySbox192.rsp",
-            "CBCKeySbox256.rsp",
-            "CBCVarKey128.rsp",
-            "CBCVarKey192.rsp",
-            "CBCVarKey256.rsp",
-            "CBCVarTxt128.rsp",
-            "CBCVarTxt192.rsp",
-            "CBCVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "CBCMMT128.rsp",
-            "CBCMMT192.rsp",
-            "CBCMMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-
-class TestAES_ECB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "ECBGFSbox128.rsp",
-            "ECBGFSbox192.rsp",
-            "ECBGFSbox256.rsp",
-            "ECBKeySbox128.rsp",
-            "ECBKeySbox192.rsp",
-            "ECBKeySbox256.rsp",
-            "ECBVarKey128.rsp",
-            "ECBVarKey192.rsp",
-            "ECBVarKey256.rsp",
-            "ECBVarTxt128.rsp",
-            "ECBVarTxt192.rsp",
-            "ECBVarTxt256.rsp",
-        ],
-        lambda key: ciphers.AES(binascii.unhexlify(key)),
-        lambda key: modes.ECB(),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "ECBMMT128.rsp",
-            "ECBMMT192.rsp",
-            "ECBMMT256.rsp",
-        ],
-        lambda key: ciphers.AES(binascii.unhexlify(key)),
-        lambda key: modes.ECB(),
-    )
-
-
-class TestAES_OFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "OFBGFSbox128.rsp",
-            "OFBGFSbox192.rsp",
-            "OFBGFSbox256.rsp",
-            "OFBKeySbox128.rsp",
-            "OFBKeySbox192.rsp",
-            "OFBKeySbox256.rsp",
-            "OFBVarKey128.rsp",
-            "OFBVarKey192.rsp",
-            "OFBVarKey256.rsp",
-            "OFBVarTxt128.rsp",
-            "OFBVarTxt192.rsp",
-            "OFBVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "OFBMMT128.rsp",
-            "OFBMMT192.rsp",
-            "OFBMMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestAES_CFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "CFB128GFSbox128.rsp",
-            "CFB128GFSbox192.rsp",
-            "CFB128GFSbox256.rsp",
-            "CFB128KeySbox128.rsp",
-            "CFB128KeySbox192.rsp",
-            "CFB128KeySbox256.rsp",
-            "CFB128VarKey128.rsp",
-            "CFB128VarKey192.rsp",
-            "CFB128VarKey256.rsp",
-            "CFB128VarTxt128.rsp",
-            "CFB128VarTxt192.rsp",
-            "CFB128VarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "CFB128MMT128.rsp",
-            "CFB128MMT192.rsp",
-            "CFB128MMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_CBC(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TCBCinvperm.rsp",
-            "TCBCpermop.rsp",
-            "TCBCsubtab.rsp",
-            "TCBCvarkey.rsp",
-            "TCBCvartext.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TCBCMMT1.rsp",
-            "TCBCMMT2.rsp",
-            "TCBCMMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_OFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TOFBpermop.rsp",
-            "TOFBsubtab.rsp",
-            "TOFBvarkey.rsp",
-            "TOFBvartext.rsp",
-            "TOFBinvperm.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TOFBMMT1.rsp",
-            "TOFBMMT2.rsp",
-            "TOFBMMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_CFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TCFB64invperm.rsp",
-            "TCFB64permop.rsp",
-            "TCFB64subtab.rsp",
-            "TCFB64varkey.rsp",
-            "TCFB64vartext.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TCFB64MMT1.rsp",
-            "TCFB64MMT2.rsp",
-            "TCFB64MMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.CFB(binascii.unhexlify(iv)),
-    )