From 9c0fcd931f924fb11608d097729ecbf71eedd3b7 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 3 May 2014 19:33:58 -0700 Subject: Switch tests to pass salt length to the right place, except where actually testing the deprecation support --- tests/hazmat/primitives/test_rsa.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 63d62657..11bb7eed 100644 --- a/tests/hazmat/primitives/test_rsa.py +++ b/tests/hazmat/primitives/test_rsa.py @@ -944,8 +944,8 @@ class TestRSAVerification(object): padding.PSS( mgf=padding.MGF1( algorithm=hashes.SHA1(), - salt_length=1000000 - ) + ), + salt_length=1000000 ), hashes.SHA1(), backend @@ -972,8 +972,8 @@ class TestRSAPSSMGF1Verification(object): lambda params, hash_alg: padding.PSS( mgf=padding.MGF1( algorithm=hash_alg, - salt_length=params["salt_length"] - ) + ), + salt_length=params["salt_length"] ) )) @@ -992,8 +992,8 @@ class TestRSAPSSMGF1Verification(object): lambda params, hash_alg: padding.PSS( mgf=padding.MGF1( algorithm=hash_alg, - salt_length=params["salt_length"] - ) + ), + salt_length=params["salt_length"] ) )) @@ -1012,8 +1012,8 @@ class TestRSAPSSMGF1Verification(object): lambda params, hash_alg: padding.PSS( mgf=padding.MGF1( algorithm=hash_alg, - salt_length=params["salt_length"] - ) + ), + salt_length=params["salt_length"] ) )) @@ -1032,8 +1032,8 @@ class TestRSAPSSMGF1Verification(object): lambda params, hash_alg: padding.PSS( mgf=padding.MGF1( algorithm=hash_alg, - salt_length=params["salt_length"] - ) + ), + salt_length=params["salt_length"] ) )) @@ -1052,8 +1052,8 @@ class TestRSAPSSMGF1Verification(object): lambda params, hash_alg: padding.PSS( mgf=padding.MGF1( algorithm=hash_alg, - salt_length=params["salt_length"] - ) + ), + salt_length=params["salt_length"] ) )) -- cgit v1.2.3 From 192ac59589bf0654b668644809d37caa151a6c56 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 3 May 2014 19:40:52 -0700 Subject: Here too --- tests/hazmat/backends/test_openssl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index bba7d758..ebf1570f 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -270,8 +270,8 @@ class TestOpenSSLRSA(object): padding.PSS( mgf=padding.MGF1( algorithm=hashes.SHA256(), - salt_length=padding.MGF1.MAX_LENGTH - ) + ), + salt_length=padding.MGF1.MAX_LENGTH ), hashes.SHA1(), backend @@ -283,8 +283,8 @@ class TestOpenSSLRSA(object): padding.PSS( mgf=padding.MGF1( algorithm=hashes.SHA256(), - salt_length=padding.MGF1.MAX_LENGTH - ) + ), + salt_length=padding.MGF1.MAX_LENGTH ), hashes.SHA1(), backend -- cgit v1.2.3 From 6b9d6b2535ab21a124faf307dee54ef7e8f3f31b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 3 May 2014 19:47:21 -0700 Subject: Always use deprecated_call --- tests/hazmat/primitives/test_rsa.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 11bb7eed..be5e8bfc 100644 --- a/tests/hazmat/primitives/test_rsa.py +++ b/tests/hazmat/primitives/test_rsa.py @@ -458,8 +458,10 @@ class TestRSASignature(object): backend=backend ) signer = private_key.signer( - padding.PSS( - mgf=padding.MGF1( + pytest.deprecated_call( + padding.PSS, + mgf=pytest.deprecated_call( + padding.MGF1, algorithm=hashes.SHA1(), salt_length=padding.MGF1.MAX_LENGTH ) @@ -472,8 +474,10 @@ class TestRSASignature(object): assert len(signature) == math.ceil(private_key.key_size / 8.0) verifier = private_key.public_key().verifier( signature, - padding.PSS( - mgf=padding.MGF1( + pytest.deprecated_call( + padding.PSS, + mgf=pytest.deprecated_call( + padding.MGF1, algorithm=hashes.SHA1(), salt_length=padding.MGF1.MAX_LENGTH ) -- cgit v1.2.3 From 0891547c95142cee0ef370d737667570faa5c706 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 3 May 2014 19:53:54 -0700 Subject: Whoopsie daysie. That's a fun commit message. So lyrical. --- tests/hazmat/backends/test_openssl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index ebf1570f..154af00f 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -271,7 +271,7 @@ class TestOpenSSLRSA(object): mgf=padding.MGF1( algorithm=hashes.SHA256(), ), - salt_length=padding.MGF1.MAX_LENGTH + salt_length=padding.PSS.MAX_LENGTH ), hashes.SHA1(), backend @@ -284,7 +284,7 @@ class TestOpenSSLRSA(object): mgf=padding.MGF1( algorithm=hashes.SHA256(), ), - salt_length=padding.MGF1.MAX_LENGTH + salt_length=padding.PSS.MAX_LENGTH ), hashes.SHA1(), backend -- cgit v1.2.3