diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-28 10:09:15 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-28 10:09:15 -0700 |
| commit | 9d683f71433ca4f2a09052159dc10d2f2dcb3222 (patch) | |
| tree | 86928a635b22a4dc36bce266550323533e166ff8 /tests/utils.py | |
| parent | 01fbdf74967f8e22e3ea2d15f195898c64d34cc3 (diff) | |
| parent | 0a1550e86fbb8a64a1f534babd76da5afd1c4c11 (diff) | |
| download | cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.tar.gz cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.tar.bz2 cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.zip | |
Merge pull request #188 from dstufft/hazmat
Create a Hazardous Materials Area
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 10 |
1 files changed, 6 insertions, 4 deletions
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) |