diff options
author | David Reid <dreid@dreid.org> | 2013-10-31 11:20:58 -0700 |
---|---|---|
committer | David Reid <dreid@dreid.org> | 2013-10-31 11:20:58 -0700 |
commit | 6adaf277a100412826af6c8cdd31753832c5609a (patch) | |
tree | 949256dedba6481afbd97c48ebb41be7e52af896 /tests/utils.py | |
parent | d5e9c8ddf0e644a740945a29cfa486ba25426300 (diff) | |
parent | b735107f0fe9529cbef070fe50112ac2c9ed9402 (diff) | |
download | cryptography-6adaf277a100412826af6c8cdd31753832c5609a.tar.gz cryptography-6adaf277a100412826af6c8cdd31753832c5609a.tar.bz2 cryptography-6adaf277a100412826af6c8cdd31753832c5609a.zip |
Merge pull request #198 from reaperhulk/vector-movin
Restructure vectors into ciphers/hashes/hmac
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) |