diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-12 09:23:02 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-12 09:23:02 -0800 |
| commit | 1d75bfa060ff55c4e415a8d34f8e55025fed9a86 (patch) | |
| tree | dbb32f57709358945325c14b09edcee993b29fb2 /tests/hazmat/primitives/test_hash_vectors.py | |
| parent | d3683ec33d0ca1aa8b47bdafff65d79ee13ea08c (diff) | |
| parent | f7f6a9f77ade1b190766c37cc8967375b5093175 (diff) | |
| download | cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.tar.gz cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.tar.bz2 cryptography-1d75bfa060ff55c4e415a8d34f8e55025fed9a86.zip | |
Merge pull request #244 from reaperhulk/less-loaders
Remove separate vector file loaders and replace with one
Diffstat (limited to 'tests/hazmat/primitives/test_hash_vectors.py')
| -rw-r--r-- | tests/hazmat/primitives/test_hash_vectors.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/hazmat/primitives/test_hash_vectors.py b/tests/hazmat/primitives/test_hash_vectors.py index fca839c7..b08beca6 100644 --- a/tests/hazmat/primitives/test_hash_vectors.py +++ b/tests/hazmat/primitives/test_hash_vectors.py @@ -18,12 +18,12 @@ import os from cryptography.hazmat.primitives import hashes from .utils import generate_hash_test, generate_long_string_hash_test -from ...utils import load_hash_vectors_from_file +from ...utils import load_hash_vectors class TestSHA1(object): test_SHA1 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "SHA1"), [ "SHA1LongMsg.rsp", @@ -37,7 +37,7 @@ class TestSHA1(object): class TestSHA224(object): test_SHA224 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "SHA2"), [ "SHA224LongMsg.rsp", @@ -51,7 +51,7 @@ class TestSHA224(object): class TestSHA256(object): test_SHA256 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "SHA2"), [ "SHA256LongMsg.rsp", @@ -65,7 +65,7 @@ class TestSHA256(object): class TestSHA384(object): test_SHA384 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "SHA2"), [ "SHA384LongMsg.rsp", @@ -79,7 +79,7 @@ class TestSHA384(object): class TestSHA512(object): test_SHA512 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "SHA2"), [ "SHA512LongMsg.rsp", @@ -93,7 +93,7 @@ class TestSHA512(object): class TestRIPEMD160(object): test_RIPEMD160 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "ripemd160"), [ "ripevectors.txt", @@ -113,7 +113,7 @@ class TestRIPEMD160(object): class TestWhirlpool(object): test_whirlpool = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "whirlpool"), [ "iso-test-vectors.txt", @@ -135,7 +135,7 @@ class TestWhirlpool(object): class TestMD5(object): test_md5 = generate_hash_test( - load_hash_vectors_from_file, + load_hash_vectors, os.path.join("hashes", "MD5"), [ "rfc-1321.txt", |