From b3b0fbe2fb4f3c6939c05ff90e0201fb78c51074 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 26 Jun 2015 19:57:18 -0400 Subject: Make the parameter ordering in sign() consistent with other code --- tests/test_x509.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'tests/test_x509.py') diff --git a/tests/test_x509.py b/tests/test_x509.py index ee83ed2d..971f149c 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -689,7 +689,7 @@ class TestCertificateSigningRequestBuilder(object): builder = x509.CertificateSigningRequestBuilder() with pytest.raises(TypeError): - builder.sign(backend, private_key, 'NotAHash') + builder.sign(private_key, 'NotAHash', backend) @pytest.mark.requires_backend_interface(interface=RSABackend) def test_build_ca_request_with_rsa(self, backend): @@ -701,9 +701,7 @@ class TestCertificateSigningRequestBuilder(object): ]) ).add_extension( x509.BasicConstraints(ca=True, path_length=2), critical=True - ).sign( - backend, private_key, hashes.SHA1() - ) + ).sign(private_key, hashes.SHA1(), backend) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) public_key = request.public_key() @@ -730,9 +728,7 @@ class TestCertificateSigningRequestBuilder(object): ]) ).add_extension( x509.BasicConstraints(ca=True, path_length=2), critical=True - ).sign( - backend, private_key, hashes.SHA1() - ) + ).sign(private_key, hashes.SHA1(), backend) loaded_request = x509.load_pem_x509_csr( request.public_bytes(encoding=serialization.Encoding.PEM), backend @@ -753,9 +749,7 @@ class TestCertificateSigningRequestBuilder(object): ]) ).add_extension( x509.BasicConstraints(ca=False, path_length=None), critical=True, - ).sign( - backend, private_key, hashes.SHA1() - ) + ).sign(private_key, hashes.SHA1(), backend) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) public_key = request.public_key() @@ -785,9 +779,7 @@ class TestCertificateSigningRequestBuilder(object): ]) ).add_extension( x509.BasicConstraints(ca=True, path_length=2), critical=True - ).sign( - backend, private_key, hashes.SHA1() - ) + ).sign(private_key, hashes.SHA1(), backend) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) public_key = request.public_key() @@ -816,9 +808,7 @@ class TestCertificateSigningRequestBuilder(object): ]) ).add_extension( x509.BasicConstraints(ca=True, path_length=2), critical=True - ).sign( - backend, private_key, hashes.SHA1() - ) + ).sign(private_key, hashes.SHA1(), backend) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) public_key = request.public_key() -- cgit v1.2.3 From 76a0a644423477825623d69b27fd9e9b01edf89c Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 26 Jun 2015 20:26:25 -0400 Subject: fix this test --- tests/test_x509.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_x509.py') diff --git a/tests/test_x509.py b/tests/test_x509.py index 03e95156..08dae0ce 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -858,7 +858,7 @@ class TestCertificateSigningRequestBuilder(object): critical=False, ) with pytest.raises(NotImplementedError): - builder.sign(backend, private_key, hashes.SHA256()) + builder.sign(private_key, hashes.SHA256(), backend) def test_set_subject_twice(self): builder = x509.CertificateSigningRequestBuilder() -- cgit v1.2.3