diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-03 17:11:55 -1000 | 
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-06-03 23:11:55 -0400 | 
| commit | 1a5d70e876346653b3dfa2a95f188ef0eb92bd7d (patch) | |
| tree | b940ff3a938a91613860dd20bc9e63568b78734b /tests | |
| parent | e6055fbfb2b1b7b00b361615d4c665c6e9fc0b6d (diff) | |
| download | cryptography-1a5d70e876346653b3dfa2a95f188ef0eb92bd7d.tar.gz cryptography-1a5d70e876346653b3dfa2a95f188ef0eb92bd7d.tar.bz2 cryptography-1a5d70e876346653b3dfa2a95f188ef0eb92bd7d.zip | |
deprecate signer/verifier on asymmetric keys (#3663)
* deprecate signer/verifier on asymmetric keys
* review feedback, switch deprecated_call to work around a bug
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_dsa.py | 7 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_ec.py | 6 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_rsa.py | 9 | 
3 files changed, 16 insertions, 6 deletions
| diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py index 6ea05775..34197772 100644 --- a/tests/hazmat/primitives/test_dsa.py +++ b/tests/hazmat/primitives/test_dsa.py @@ -575,7 +575,10 @@ class TestDSAVerification(object):              y=vector['y']          ).public_key(backend)          sig = encode_dss_signature(vector['r'], vector['s']) -        verifier = public_key.verifier(sig, algorithm()) +        verifier = pytest.deprecated_call( +            public_key.verifier, sig, algorithm() +        ) +          verifier.update(vector['msg'])          if vector['result'] == "F":              with pytest.raises(InvalidSignature): @@ -685,7 +688,7 @@ class TestDSASignature(object):              ),              x=vector['x']          ).private_key(backend) -        signer = private_key.signer(algorithm()) +        signer = pytest.deprecated_call(private_key.signer, algorithm())          signer.update(vector['msg'])          signature = signer.finalize()          assert signature diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py index d9177045..82cf2fae 100644 --- a/tests/hazmat/primitives/test_ec.py +++ b/tests/hazmat/primitives/test_ec.py @@ -351,11 +351,13 @@ class TestECDSAVectors(object):          pkey = key.public_key()          assert pkey -        signer = key.signer(ec.ECDSA(hash_type())) +        signer = pytest.deprecated_call(key.signer, ec.ECDSA(hash_type()))          signer.update(b"YELLOW SUBMARINE")          signature = signer.finalize() -        verifier = pkey.verifier(signature, ec.ECDSA(hash_type())) +        verifier = pytest.deprecated_call( +            pkey.verifier, signature, ec.ECDSA(hash_type()) +        )          verifier.update(b"YELLOW SUBMARINE")          verifier.verify() diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 7ce2746c..627248fd 100644 --- a/tests/hazmat/primitives/test_rsa.py +++ b/tests/hazmat/primitives/test_rsa.py @@ -256,7 +256,11 @@ class TestRSASignature(object):                  n=private["modulus"]              )          ).private_key(backend) -        signer = private_key.signer(padding.PKCS1v15(), hashes.SHA1()) +        signer = pytest.deprecated_call( +            private_key.signer, +            padding.PKCS1v15(), +            hashes.SHA1() +        )          signer.update(binascii.unhexlify(example["message"]))          signature = signer.finalize()          assert binascii.hexlify(signature) == example["signature"] @@ -583,7 +587,8 @@ class TestRSAVerification(object):              e=public["public_exponent"],              n=public["modulus"]          ).public_key(backend) -        verifier = public_key.verifier( +        verifier = pytest.deprecated_call( +            public_key.verifier,              binascii.unhexlify(example["signature"]),              padding.PKCS1v15(),              hashes.SHA1() | 
