aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utils.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/utils.py
parentd5e9c8ddf0e644a740945a29cfa486ba25426300 (diff)
downloadcryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.tar.gz
cryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.tar.bz2
cryptography-2b758679b3cc2ba936734b34e0865905b4340c5a.zip
restructure vectors into ciphers/hashes/hmac
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/utils.py b/tests/utils.py
index ad676c04..99ba2e2f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -53,7 +53,7 @@ def load_nist_vectors(vector_data, op):
def load_nist_vectors_from_file(filename, op):
base = os.path.join(
- os.path.dirname(__file__), "hazmat", "primitives", "vectors", "NIST",
+ os.path.dirname(__file__), "hazmat", "primitives", "vectors",
)
with open(os.path.join(base, filename), "r") as vector_file:
return load_nist_vectors(vector_file, op)
@@ -62,7 +62,7 @@ def load_nist_vectors_from_file(filename, op):
def load_cryptrec_vectors_from_file(filename):
base = os.path.join(
os.path.dirname(__file__),
- "hazmat", "primitives", "vectors", "CRYPTREC",
+ "hazmat", "primitives", "vectors",
)
with open(os.path.join(base, filename), "r") as vector_file:
return load_cryptrec_vectors(vector_file)
@@ -99,7 +99,7 @@ def load_cryptrec_vectors(vector_data):
def load_openssl_vectors_from_file(filename):
base = os.path.join(
os.path.dirname(__file__),
- "hazmat", "primitives", "vectors", "OpenSSL",
+ "hazmat", "primitives", "vectors",
)
with open(os.path.join(base, filename), "r") as vector_file:
return load_openssl_vectors(vector_file)