aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/backends
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-03 22:36:42 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-03 22:36:42 -0500
commit568973764f8c5c93679cc50b6c3f2a34079a62d5 (patch)
tree3c8ba1fee019e9ef6ad45616b634a7133feb5bf6 /tests/hazmat/backends
parent94e405396ebd7efd9f4958416dfa38d49fcfbe21 (diff)
parent0891547c95142cee0ef370d737667570faa5c706 (diff)
downloadcryptography-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/hazmat/backends')
-rw-r--r--tests/hazmat/backends/test_openssl.py8
1 files changed, 4 insertions, 4 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