From 22eb4c91914cd2f0ad2cb67ad27e5bfb60400492 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 27 Oct 2014 10:24:43 -0700
Subject: Added attributes that are part of hte interface to several test fakes

---
 .travis/run.sh                             | 2 +-
 tests/hazmat/backends/test_commoncrypto.py | 1 +
 tests/hazmat/backends/test_openssl.py      | 3 +++
 tests/hazmat/primitives/test_block.py      | 1 +
 tests/hazmat/primitives/test_ec.py         | 2 +-
 tests/hazmat/primitives/test_hashes.py     | 2 ++
 tests/hazmat/primitives/test_hmac.py       | 2 ++
 tests/hazmat/primitives/test_pbkdf2hmac.py | 2 ++
 8 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.travis/run.sh b/.travis/run.sh
index e4ff2661..b4559f32 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -18,4 +18,4 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     fi
 fi
 source ~/.venv/bin/activate
-tox -e $TOX_ENV -- $TOX_FLAGS
+tox -e "$TOX_ENV" -- $TOX_FLAGS
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py
index 28d1a6ca..6bb0ede0 100644
--- a/tests/hazmat/backends/test_commoncrypto.py
+++ b/tests/hazmat/backends/test_commoncrypto.py
@@ -30,6 +30,7 @@ from ...utils import raises_unsupported_algorithm
 class DummyCipher(object):
     name = "dummy-cipher"
     block_size = 128
+    digest_size = None
 
 
 @pytest.mark.skipif("commoncrypto" not in
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 39708f82..ebd8686c 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -52,6 +52,7 @@ class DummyMode(object):
 @utils.register_interface(interfaces.CipherAlgorithm)
 class DummyCipher(object):
     name = "dummy-cipher"
+    key_size = None
 
 
 @utils.register_interface(interfaces.AsymmetricPadding)
@@ -62,6 +63,8 @@ class DummyPadding(object):
 @utils.register_interface(interfaces.HashAlgorithm)
 class DummyHash(object):
     name = "dummy-hash"
+    block_size = None
+    digest_size = None
 
 
 class DummyMGF(object):
diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py
index 6ee230a7..14f76758 100644
--- a/tests/hazmat/primitives/test_block.py
+++ b/tests/hazmat/primitives/test_block.py
@@ -44,6 +44,7 @@ class DummyMode(object):
 @utils.register_interface(interfaces.CipherAlgorithm)
 class DummyCipher(object):
     name = "dummy-cipher"
+    key_size = None
 
 
 @pytest.mark.requires_backend_interface(interface=CipherBackend)
diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py
index decb3716..e6a9146c 100644
--- a/tests/hazmat/primitives/test_ec.py
+++ b/tests/hazmat/primitives/test_ec.py
@@ -68,7 +68,7 @@ class DummyCurve(object):
 
 @utils.register_interface(interfaces.EllipticCurveSignatureAlgorithm)
 class DummySignatureAlgorithm(object):
-    pass
+    algorithm = None
 
 
 @utils.register_interface(EllipticCurveBackend)
diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py
index ba4f53af..0fdd7550 100644
--- a/tests/hazmat/primitives/test_hashes.py
+++ b/tests/hazmat/primitives/test_hashes.py
@@ -33,6 +33,8 @@ from ...utils import raises_unsupported_algorithm
 @utils.register_interface(interfaces.HashAlgorithm)
 class UnsupportedDummyHash(object):
     name = "unsupported-dummy-hash"
+    block_size = None
+    digest_size = None
 
 
 @pytest.mark.requires_backend_interface(interface=HashBackend)
diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py
index baf8a299..3553632c 100644
--- a/tests/hazmat/primitives/test_hmac.py
+++ b/tests/hazmat/primitives/test_hmac.py
@@ -33,6 +33,8 @@ from ...utils import raises_unsupported_algorithm
 @utils.register_interface(interfaces.HashAlgorithm)
 class UnsupportedDummyHash(object):
     name = "unsupported-dummy-hash"
+    block_size = None
+    digest_size = None
 
 
 @pytest.mark.supported(
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py
index e928fc6a..c140c14d 100644
--- a/tests/hazmat/primitives/test_pbkdf2hmac.py
+++ b/tests/hazmat/primitives/test_pbkdf2hmac.py
@@ -31,6 +31,8 @@ from ...utils import raises_unsupported_algorithm
 @utils.register_interface(interfaces.HashAlgorithm)
 class DummyHash(object):
     name = "dummy-hash"
+    block_size = None
+    digest_size = None
 
 
 class TestPBKDF2HMAC(object):
-- 
cgit v1.2.3


From 117742d9ebf7504e642031dc020abf305ffb33b1 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 27 Oct 2014 12:56:43 -0700
Subject: Undo change that's unrelatedo this branch

---
 .travis/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/run.sh b/.travis/run.sh
index b4559f32..e4ff2661 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -18,4 +18,4 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     fi
 fi
 source ~/.venv/bin/activate
-tox -e "$TOX_ENV" -- $TOX_FLAGS
+tox -e $TOX_ENV -- $TOX_FLAGS
-- 
cgit v1.2.3