aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_openssl_vectors.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-30 09:01:38 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-30 09:01:38 -0500
commit2b758679b3cc2ba936734b34e0865905b4340c5a (patch)
treecfde231bb4d89534d22648a323c03583c9cf3103 /tests/hazmat/primitives/test_openssl_vectors.py
parentd5e9c8ddf0e644a740945a29cfa486ba25426300 (diff)
downloadcryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.tar.gz
cryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.tar.bz2
cryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.zip
restructure vectors into ciphers/hashes/hmac
Diffstat (limited to 'tests/hazmat/primitives/test_openssl_vectors.py')
-rw-r--r--tests/hazmat/primitives/test_openssl_vectors.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_openssl_vectors.py b/tests/hazmat/primitives/test_openssl_vectors.py
index 94037247..2a3e44f3 100644
--- a/tests/hazmat/primitives/test_openssl_vectors.py
+++ b/tests/hazmat/primitives/test_openssl_vectors.py
@@ -19,6 +19,8 @@ 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
@@ -28,7 +30,7 @@ from ...utils import load_openssl_vectors_from_file
class TestCamelliaCBC(object):
test_OpenSSL = generate_encrypt_test(
load_openssl_vectors_from_file,
- "Camellia",
+ os.path.join("ciphers", "Camellia"),
["camellia-cbc.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
@@ -42,7 +44,7 @@ class TestCamelliaCBC(object):
class TestCamelliaOFB(object):
test_OpenSSL = generate_encrypt_test(
load_openssl_vectors_from_file,
- "Camellia",
+ os.path.join("ciphers", "Camellia"),
["camellia-ofb.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
@@ -56,7 +58,7 @@ class TestCamelliaOFB(object):
class TestCamelliaCFB(object):
test_OpenSSL = generate_encrypt_test(
load_openssl_vectors_from_file,
- "Camellia",
+ os.path.join("ciphers", "Camellia"),
["camellia-cfb.txt"],
lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
@@ -70,7 +72,7 @@ class TestCamelliaCFB(object):
class TestAESCTR(object):
test_OpenSSL = generate_encrypt_test(
load_openssl_vectors_from_file,
- "AES",
+ os.path.join("ciphers", "AES", "CTR"),
["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
lambda key, iv: modes.CTR(binascii.unhexlify(iv)),