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/hazmat/primitives/test_hash_vectors.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/hazmat/primitives/test_hash_vectors.py')
-rw-r--r-- | tests/hazmat/primitives/test_hash_vectors.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/hazmat/primitives/test_hash_vectors.py b/tests/hazmat/primitives/test_hash_vectors.py index ebb24350..5c3e72d4 100644 --- a/tests/hazmat/primitives/test_hash_vectors.py +++ b/tests/hazmat/primitives/test_hash_vectors.py @@ -24,7 +24,7 @@ from ...utils import load_hash_vectors_from_file class TestSHA1(object): test_SHA1 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("NIST", "SHABYTE"), + os.path.join("hashes", "SHA1"), [ "SHA1LongMsg.rsp", "SHA1ShortMsg.rsp", @@ -38,7 +38,7 @@ class TestSHA1(object): class TestSHA224(object): test_SHA224 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("NIST", "SHABYTE"), + os.path.join("hashes", "SHA2"), [ "SHA224LongMsg.rsp", "SHA224ShortMsg.rsp", @@ -52,7 +52,7 @@ class TestSHA224(object): class TestSHA256(object): test_SHA256 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("NIST", "SHABYTE"), + os.path.join("hashes", "SHA2"), [ "SHA256LongMsg.rsp", "SHA256ShortMsg.rsp", @@ -66,7 +66,7 @@ class TestSHA256(object): class TestSHA384(object): test_SHA384 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("NIST", "SHABYTE"), + os.path.join("hashes", "SHA2"), [ "SHA384LongMsg.rsp", "SHA384ShortMsg.rsp", @@ -80,7 +80,7 @@ class TestSHA384(object): class TestSHA512(object): test_SHA512 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("NIST", "SHABYTE"), + os.path.join("hashes", "SHA2"), [ "SHA512LongMsg.rsp", "SHA512ShortMsg.rsp", @@ -94,7 +94,7 @@ class TestSHA512(object): class TestRIPEMD160(object): test_RIPEMD160 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("ISO", "ripemd160"), + os.path.join("hashes", "ripemd160"), [ "ripevectors.txt", ], @@ -114,7 +114,7 @@ class TestRIPEMD160(object): class TestWhirlpool(object): test_whirlpool = generate_hash_test( load_hash_vectors_from_file, - os.path.join("ISO", "whirlpool"), + os.path.join("hashes", "whirlpool"), [ "iso-test-vectors.txt", ], @@ -136,7 +136,7 @@ class TestWhirlpool(object): class TestMD5(object): test_md5 = generate_hash_test( load_hash_vectors_from_file, - os.path.join("RFC", "MD5"), + os.path.join("hashes", "MD5"), [ "rfc-1321.txt", ], |