diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-11 11:37:04 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-29 00:24:19 -0500 |
| commit | 31e398802c79d3b4a182b28f17b99595e84bbe2a (patch) | |
| tree | 9d1c6d4ad7b0a3e7306353551f154a09e87aba56 /tests | |
| parent | 62c91ebe2bb715c4f572174a58e6367e414cba85 (diff) | |
| download | cryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.tar.gz cryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.tar.bz2 cryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.zip | |
rename request to CSR
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/backends/test_multibackend.py | 6 | ||||
| -rw-r--r-- | tests/test_x509.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 8f833ad2..40305387 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -197,7 +197,7 @@ class DummyX509Backend(object): def load_der_x509_certificate(self, data): pass - def load_pem_x509_request(self, data): + def load_pem_x509_csr(self, data): pass @@ -475,7 +475,7 @@ class TestMultiBackend(object): backend.load_pem_x509_certificate(b"certdata") backend.load_der_x509_certificate(b"certdata") - backend.load_pem_x509_request(b"reqdata") + backend.load_pem_x509_csr(b"reqdata") backend = MultiBackend([]) with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_X509): @@ -483,4 +483,4 @@ class TestMultiBackend(object): with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_X509): backend.load_der_x509_certificate(b"certdata") with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_X509): - backend.load_pem_x509_request(b"reqdata") + backend.load_pem_x509_csr(b"reqdata") diff --git a/tests/test_x509.py b/tests/test_x509.py index 8f188885..3665adc3 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -343,7 +343,7 @@ class TestRSACertificate(object): def test_load_rsa_certificate_request(self, backend): request = _load_cert( os.path.join("x509", "requests", "rsa_sha1.pem"), - x509.load_pem_x509_request, + x509.load_pem_x509_csr, backend ) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) @@ -362,7 +362,7 @@ class TestRSACertificate(object): def test_unsupported_signature_hash_algorithm_request(self, backend): request = _load_cert( os.path.join("x509", "requests", "rsa_md4.pem"), - x509.load_pem_x509_request, + x509.load_pem_x509_csr, backend ) with pytest.raises(UnsupportedAlgorithm): @@ -423,7 +423,7 @@ class TestDSACertificate(object): def test_load_dsa_request(self, backend): request = _load_cert( os.path.join("x509", "requests", "dsa_sha1.pem"), - x509.load_pem_x509_request, + x509.load_pem_x509_csr, backend ) assert isinstance(request.signature_hash_algorithm, hashes.SHA1) @@ -479,7 +479,7 @@ class TestECDSACertificate(object): _skip_curve_unsupported(backend, ec.SECP384R1()) request = _load_cert( os.path.join("x509", "requests", "ec_sha256.pem"), - x509.load_pem_x509_request, + x509.load_pem_x509_csr, backend ) assert isinstance(request.signature_hash_algorithm, hashes.SHA256) |