From f04317ae24441082279ea73ccca0a6630c33cc86 Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Sun, 27 Oct 2013 16:44:30 -0400 Subject: Move primtives into a hazmat package --- tests/utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index fa7cc68d..9d01746a 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__), "primitives", "vectors", "NIST", + os.path.dirname(__file__), "hazmat", "primitives", "vectors", "NIST", ) with open(os.path.join(base, filename), "r") as vector_file: return load_nist_vectors(vector_file, op) @@ -61,7 +61,8 @@ def load_nist_vectors_from_file(filename, op): def load_cryptrec_vectors_from_file(filename): base = os.path.join( - os.path.dirname(__file__), "primitives", "vectors", "CRYPTREC", + os.path.dirname(__file__), + "hazmat", "primitives", "vectors", "CRYPTREC", ) with open(os.path.join(base, filename), "r") as vector_file: return load_cryptrec_vectors(vector_file) @@ -97,7 +98,8 @@ def load_cryptrec_vectors(vector_data): def load_openssl_vectors_from_file(filename): base = os.path.join( - os.path.dirname(__file__), "primitives", "vectors", "OpenSSL", + os.path.dirname(__file__), + "hazmat", "primitives", "vectors", "OpenSSL", ) with open(os.path.join(base, filename), "r") as vector_file: return load_openssl_vectors(vector_file) @@ -152,7 +154,7 @@ def load_hash_vectors(vector_data): def load_hash_vectors_from_file(filename): base = os.path.join( - os.path.dirname(__file__), "primitives", "vectors" + os.path.dirname(__file__), "hazmat", "primitives", "vectors" ) with open(os.path.join(base, filename), "r") as vector_file: return load_hash_vectors(vector_file) -- cgit v1.2.3