From 162a17e246f51c90f61fe135e1db1006965a3385 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 23 Jul 2018 19:55:06 +0800
Subject: block_size isn't part of our interface and future hashes won't have
 it (#4366)

---
 tests/hazmat/primitives/test_hashes.py | 8 --------
 tests/hazmat/primitives/utils.py       | 7 +++----
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'tests/hazmat')

diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py
index 60950aed..c2b866f7 100644
--- a/tests/hazmat/primitives/test_hashes.py
+++ b/tests/hazmat/primitives/test_hashes.py
@@ -53,7 +53,6 @@ class TestSHA1(object):
     test_SHA1 = generate_base_hash_test(
         hashes.SHA1(),
         digest_size=20,
-        block_size=64,
     )
 
 
@@ -66,7 +65,6 @@ class TestSHA224(object):
     test_SHA224 = generate_base_hash_test(
         hashes.SHA224(),
         digest_size=28,
-        block_size=64,
     )
 
 
@@ -79,7 +77,6 @@ class TestSHA256(object):
     test_SHA256 = generate_base_hash_test(
         hashes.SHA256(),
         digest_size=32,
-        block_size=64,
     )
 
 
@@ -92,7 +89,6 @@ class TestSHA384(object):
     test_SHA384 = generate_base_hash_test(
         hashes.SHA384(),
         digest_size=48,
-        block_size=128,
     )
 
 
@@ -105,7 +101,6 @@ class TestSHA512(object):
     test_SHA512 = generate_base_hash_test(
         hashes.SHA512(),
         digest_size=64,
-        block_size=128,
     )
 
 
@@ -118,7 +113,6 @@ class TestMD5(object):
     test_MD5 = generate_base_hash_test(
         hashes.MD5(),
         digest_size=16,
-        block_size=64,
     )
 
 
@@ -132,7 +126,6 @@ class TestBLAKE2b(object):
     test_BLAKE2b = generate_base_hash_test(
         hashes.BLAKE2b(digest_size=64),
         digest_size=64,
-        block_size=128,
     )
 
     def test_invalid_digest_size(self, backend):
@@ -156,7 +149,6 @@ class TestBLAKE2s(object):
     test_BLAKE2s = generate_base_hash_test(
         hashes.BLAKE2s(digest_size=32),
         digest_size=32,
-        block_size=64,
     )
 
     def test_invalid_digest_size(self, backend):
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index b0cc0cff..811dcf90 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -168,16 +168,15 @@ def hash_test(backend, algorithm, params):
     assert m.finalize() == binascii.unhexlify(expected_md)
 
 
-def generate_base_hash_test(algorithm, digest_size, block_size):
+def generate_base_hash_test(algorithm, digest_size):
     def test_base_hash(self, backend):
-        base_hash_test(backend, algorithm, digest_size, block_size)
+        base_hash_test(backend, algorithm, digest_size)
     return test_base_hash
 
 
-def base_hash_test(backend, algorithm, digest_size, block_size):
+def base_hash_test(backend, algorithm, digest_size):
     m = hashes.Hash(algorithm, backend=backend)
     assert m.algorithm.digest_size == digest_size
-    assert m.algorithm.block_size == block_size
     m_copy = m.copy()
     assert m != m_copy
     assert m._ctx != m_copy._ctx
-- 
cgit v1.2.3