aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-02-25 13:29:21 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-02-25 22:59:03 -0600
commit8186251635237187012df878645a4e4af3822e4e (patch)
tree2f7ed59c1228783c024df5e68331f44e99f5eed8 /tests
parent4c0b4a99982138c4ab83dfffb19975a91c57d1ab (diff)
downloadcryptography-8186251635237187012df878645a4e4af3822e4e.tar.gz
cryptography-8186251635237187012df878645a4e4af3822e4e.tar.bz2
cryptography-8186251635237187012df878645a4e4af3822e4e.zip
kwargs and class renames to bring verification up to date
Diffstat (limited to 'tests')
-rw-r--r--tests/hazmat/primitives/test_rsa.py50
1 files changed, 35 insertions, 15 deletions
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index fb4d1d77..649165b8 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -463,7 +463,7 @@ class TestRSAVerification(object):
)
verifier = public_key.verifier(
binascii.unhexlify(example["signature"]),
- padding.PKCS1(),
+ padding.PKCS1v15(),
hashes.SHA1(),
backend
)
@@ -471,48 +471,60 @@ class TestRSAVerification(object):
verifier.verify()
def test_invalid_pkcs1v15_signature_wrong_data(self, backend):
- private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
+ private_key = rsa.RSAPrivateKey.generate(
+ public_exponent=65537,
+ key_size=512,
+ backend=backend
+ )
public_key = private_key.public_key()
- signer = private_key.signer(padding.PKCS1(), hashes.SHA1(), backend)
+ signer = private_key.signer(padding.PKCS1v15(), hashes.SHA1(), backend)
signer.update(b"sign me")
signature = signer.finalize()
verifier = public_key.verifier(
signature,
- padding.PKCS1(),
+ padding.PKCS1v15(),
hashes.SHA1(),
backend
)
verifier.update(b"incorrect data")
- with pytest.raises(exceptions.InvalidAsymmetricSignature):
+ with pytest.raises(exceptions.InvalidSignature):
verifier.verify()
def test_invalid_pkcs1v15_signature_wrong_key(self, backend):
- private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
+ private_key = rsa.RSAPrivateKey.generate(
+ public_exponent=65537,
+ key_size=512,
+ backend=backend
+ )
public_key = private_key.public_key()
public_key._modulus += 2
- signer = private_key.signer(padding.PKCS1(), hashes.SHA1(), backend)
+ signer = private_key.signer(padding.PKCS1v15(), hashes.SHA1(), backend)
signer.update(b"sign me")
signature = signer.finalize()
verifier = public_key.verifier(
signature,
- padding.PKCS1(),
+ padding.PKCS1v15(),
hashes.SHA1(),
backend
)
verifier.update(b"sign me")
- with pytest.raises(exceptions.InvalidAsymmetricSignature):
+ with pytest.raises(exceptions.InvalidSignature):
verifier.verify()
def test_use_after_finalize(self, backend):
- private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
+ private_key = rsa.RSAPrivateKey.generate(
+ public_exponent=65537,
+ key_size=512,
+ backend=backend
+ )
public_key = private_key.public_key()
- signer = private_key.signer(padding.PKCS1(), hashes.SHA1(), backend)
+ signer = private_key.signer(padding.PKCS1v15(), hashes.SHA1(), backend)
signer.update(b"sign me")
signature = signer.finalize()
verifier = public_key.verifier(
signature,
- padding.PKCS1(),
+ padding.PKCS1v15(),
hashes.SHA1(),
backend
)
@@ -524,13 +536,21 @@ class TestRSAVerification(object):
verifier.update(b"more data")
def test_unsupported_padding(self, backend):
- private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
+ private_key = rsa.RSAPrivateKey.generate(
+ public_exponent=65537,
+ key_size=512,
+ backend=backend
+ )
public_key = private_key.public_key()
- with pytest.raises(exceptions.UnsupportedAsymmetricPadding):
+ with pytest.raises(exceptions.UnsupportedPadding):
public_key.verifier(b"sig", DummyPadding(), hashes.SHA1(), backend)
def test_padding_incorrect_type(self, backend):
- private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
+ private_key = rsa.RSAPrivateKey.generate(
+ public_exponent=65537,
+ key_size=512,
+ backend=backend
+ )
public_key = private_key.public_key()
with pytest.raises(TypeError):
public_key.verifier(b"sig", "notpadding", hashes.SHA1(), backend)