aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-03 19:33:58 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-03 19:33:58 -0700
commit9c0fcd931f924fb11608d097729ecbf71eedd3b7 (patch)
tree3999d790625c762fd8a05cd33fe774788f136f0b
parent13936fd4732652e8f2f191b6cd9999d3224a6805 (diff)
downloadcryptography-9c0fcd931f924fb11608d097729ecbf71eedd3b7.tar.gz
cryptography-9c0fcd931f924fb11608d097729ecbf71eedd3b7.tar.bz2
cryptography-9c0fcd931f924fb11608d097729ecbf71eedd3b7.zip
Switch tests to pass salt length to the right place, except where actually testing the deprecation support
-rw-r--r--tests/hazmat/primitives/test_rsa.py24
1 files changed, 12 insertions, 12 deletions
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"]
)
))