diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-15 15:34:35 -0500 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-29 00:25:02 -0500 |
commit | a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3 (patch) | |
tree | a9c83a4ea2815e604cf19e2756f96c64f633b7d5 /docs | |
parent | 5aadb9cec193ce3486f597dee044b77e268d9b77 (diff) | |
download | cryptography-a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3.tar.gz cryptography-a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3.tar.bz2 cryptography-a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3.zip |
rename to CertificateSigningRequest
Diffstat (limited to 'docs')
-rw-r--r-- | docs/hazmat/backends/interfaces.rst | 3 | ||||
-rw-r--r-- | docs/x509.rst | 19 |
2 files changed, 12 insertions, 10 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 2b53dfdb..15a82343 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -516,4 +516,5 @@ A specific ``backend`` may provide one or more of these interfaces. :param bytes data: PEM formatted certificate request data. - :returns: An instance of :class:`~cryptography.x509.CSR`. + :returns: An instance of + :class:`~cryptography.x509.CertificateSigningRequest`. diff --git a/docs/x509.rst b/docs/x509.rst index 03301c22..fd1b4236 100644 --- a/docs/x509.rst +++ b/docs/x509.rst @@ -77,14 +77,14 @@ Loading Certificates >>> cert.serial 2 -Loading CSRs -~~~~~~~~~~~~ +Loading Certificate Signing Requests +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. function:: load_pem_x509_csr(data, backend) .. versionadded:: 0.9 - Deserialize a certificate signing request from PEM encoded data. PEM + Deserialize a certificate signing request (CSR) from PEM encoded data. PEM requests are base64 decoded and have delimiters that look like ``-----BEGIN CERTIFICATE REQUEST-----``. This is also known as PKCS#10 format. @@ -95,7 +95,8 @@ Loading CSRs :class:`~cryptography.hazmat.backends.interfaces.X509Backend` interface. - :returns: An instance of :class:`~cryptography.x509.CSR`. + :returns: An instance of + :class:`~cryptography.x509.CertificateSigningRequest`. .. testsetup:: @@ -125,8 +126,8 @@ Loading CSRs >>> from cryptography import x509 >>> from cryptography.hazmat.backends import default_backend >>> from cryptography.hazmat.primitives import hashes - >>> request = x509.load_pem_x509_csr(pem_req_data, default_backend()) - >>> isinstance(request.signature_hash_algorithm, hashes.SHA1) + >>> csr = x509.load_pem_x509_csr(pem_req_data, default_backend()) + >>> isinstance(csr.signature_hash_algorithm, hashes.SHA1) True X.509 Certificate Object @@ -266,7 +267,7 @@ X.509 Certificate Object X.509 CSR (Certificate Signing Request) Object ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. class:: CSR +.. class:: CertificateSigningRequest .. versionadded:: 0.9 @@ -282,7 +283,7 @@ X.509 CSR (Certificate Signing Request) Object .. doctest:: >>> from cryptography.hazmat.primitives.asymmetric import rsa - >>> public_key = request.public_key() + >>> public_key = csr.public_key() >>> isinstance(public_key, rsa.RSAPublicKey) True @@ -303,7 +304,7 @@ X.509 CSR (Certificate Signing Request) Object .. doctest:: >>> from cryptography.hazmat.primitives import hashes - >>> isinstance(request.signature_hash_algorithm, hashes.SHA1) + >>> isinstance(csr.signature_hash_algorithm, hashes.SHA1) True .. class:: Name |