diff options
| author | David Reid <dreid@dreid.org> | 2013-10-31 11:51:08 -0700 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-10-31 11:51:08 -0700 |
| commit | fba0cd7a3a9b90909545326fad4e370ba4e1f320 (patch) | |
| tree | 69badb306d76b9b525d5ab03efc56114637342b9 /tests/utils.py | |
| parent | 71102d8a98b940d1d70fd47f7d87989c07650ee2 (diff) | |
| parent | 6adaf277a100412826af6c8cdd31753832c5609a (diff) | |
| download | cryptography-fba0cd7a3a9b90909545326fad4e370ba4e1f320.tar.gz cryptography-fba0cd7a3a9b90909545326fad4e370ba4e1f320.tar.bz2 cryptography-fba0cd7a3a9b90909545326fad4e370ba4e1f320.zip | |
Merge branch 'master' into primitive-hashes
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 6 |
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) |