diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:34 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 15:24:34 -0700 |
| commit | 314367541aeff53ac93d19096cd9a0fa7c21ae09 (patch) | |
| tree | d7df5f838af599ea1a90ff8dff49a25f301819a4 /tests | |
| parent | ce8f9a4e2a5d159356a06147f65e221dbdf43171 (diff) | |
| parent | 6183977b8bcad36902c7ce73f63771a4efdee83f (diff) | |
| download | cryptography-314367541aeff53ac93d19096cd9a0fa7c21ae09.tar.gz cryptography-314367541aeff53ac93d19096cd9a0fa7c21ae09.tar.bz2 cryptography-314367541aeff53ac93d19096cd9a0fa7c21ae09.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_aes.py | 14 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 12 |
2 files changed, 2 insertions, 24 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py index 0caac3b8..192da648 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -11,10 +11,6 @@ # 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 @@ -28,7 +24,7 @@ from ...utils import ( ) -class TestAES_CBC(object): +class TestAES(object): test_CBC = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "CBC"), @@ -53,8 +49,6 @@ class TestAES_CBC(object): lambda key, iv: modes.CBC(binascii.unhexlify(iv)), ) - -class TestAES_ECB(object): test_ECB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "ECB"), @@ -79,8 +73,6 @@ class TestAES_ECB(object): lambda key: modes.ECB(), ) - -class TestAES_OFB(object): test_OFB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "OFB"), @@ -105,8 +97,6 @@ class TestAES_OFB(object): lambda key, iv: modes.OFB(binascii.unhexlify(iv)), ) - -class TestAES_CFB(object): test_CFB = generate_encrypt_test( lambda path: load_nist_vectors_from_file(path, "ENCRYPT"), os.path.join("ciphers", "AES", "CFB"), @@ -131,8 +121,6 @@ class TestAES_CFB(object): lambda key, iv: modes.CFB(binascii.unhexlify(iv)), ) - -class TestAES_CTR(object): test_CTR = generate_encrypt_test( load_openssl_vectors_from_file, os.path.join("ciphers", "AES", "CTR"), 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"), |