diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-03 22:36:42 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-03 22:36:42 -0500 |
| commit | 568973764f8c5c93679cc50b6c3f2a34079a62d5 (patch) | |
| tree | 3c8ba1fee019e9ef6ad45616b634a7133feb5bf6 /tests | |
| parent | 94e405396ebd7efd9f4958416dfa38d49fcfbe21 (diff) | |
| parent | 0891547c95142cee0ef370d737667570faa5c706 (diff) | |
| download | cryptography-568973764f8c5c93679cc50b6c3f2a34079a62d5.tar.gz cryptography-568973764f8c5c93679cc50b6c3f2a34079a62d5.tar.bz2 cryptography-568973764f8c5c93679cc50b6c3f2a34079a62d5.zip | |
Merge pull request #1010 from alex/deprecated
Switch tests to pass salt length to the right place, except where actually testing the deprecation support
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 8 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_rsa.py | 36 |
2 files changed, 24 insertions, 20 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index bba7d758..154af00f 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.PSS.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.PSS.MAX_LENGTH ), hashes.SHA1(), backend diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 63d62657..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 ) @@ -944,8 +948,8 @@ class TestRSAVerification(object): padding.PSS( mgf=padding.MGF1( algorithm=hashes.SHA1(), - salt_length=1000000 - ) + ), + salt_length=1000000 ), hashes.SHA1(), backend @@ -972,8 +976,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 +996,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 +1016,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 +1036,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 +1056,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"] ) )) |