From bde6fb52129909cf319157dba95d65fb557d5013 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 18 Oct 2013 18:08:49 -0500 Subject: Hash Saga Part 3 - API changes + SHA1 support + tests --- tests/primitives/test_hashes.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/primitives/test_hashes.py (limited to 'tests/primitives/test_hashes.py') diff --git a/tests/primitives/test_hashes.py b/tests/primitives/test_hashes.py new file mode 100644 index 00000000..3419b14d --- /dev/null +++ b/tests/primitives/test_hashes.py @@ -0,0 +1,28 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import absolute_import, division, print_function + +from cryptography.primitives import hashes + +from .utils import generate_base_hash_test + + +class TestSHA1(object): + test_SHA1 = generate_base_hash_test( + lambda api: hashes.SHA1(api=api), + digest_size=20, + block_size=64, + only_if=lambda api: api.supports_hash("sha1"), + skip_message="Does not support SHA1", + ) -- cgit v1.2.3 From bb069c2fee6460185ee435ea848d80bab2ccec6c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 18 Oct 2013 19:51:01 -0500 Subject: remove unneeded lambdas from tests --- tests/primitives/test_hashes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/primitives/test_hashes.py') diff --git a/tests/primitives/test_hashes.py b/tests/primitives/test_hashes.py index 3419b14d..1bc2e9e9 100644 --- a/tests/primitives/test_hashes.py +++ b/tests/primitives/test_hashes.py @@ -20,7 +20,7 @@ from .utils import generate_base_hash_test class TestSHA1(object): test_SHA1 = generate_base_hash_test( - lambda api: hashes.SHA1(api=api), + hashes.SHA1, digest_size=20, block_size=64, only_if=lambda api: api.supports_hash("sha1"), -- cgit v1.2.3 From ba3b471e4b0f56e65acdb9d5daf64eb726d9c371 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 18 Oct 2013 20:53:04 -0500 Subject: change api.supports_hash to take a hash class rather than a str * This change means hash class names will be byte strings and we no longer need to encode to ascii on hashobject.name in create_hash_context --- tests/primitives/test_hashes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/primitives/test_hashes.py') diff --git a/tests/primitives/test_hashes.py b/tests/primitives/test_hashes.py index 1bc2e9e9..4ad5c89a 100644 --- a/tests/primitives/test_hashes.py +++ b/tests/primitives/test_hashes.py @@ -23,6 +23,6 @@ class TestSHA1(object): hashes.SHA1, digest_size=20, block_size=64, - only_if=lambda api: api.supports_hash("sha1"), + only_if=lambda api: api.supports_hash(hashes.SHA1), skip_message="Does not support SHA1", ) -- cgit v1.2.3