aboutsummaryrefslogtreecommitdiffstats
path: root/docs/x509.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-11 11:37:04 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-29 00:24:19 -0500
commit31e398802c79d3b4a182b28f17b99595e84bbe2a (patch)
tree9d1c6d4ad7b0a3e7306353551f154a09e87aba56 /docs/x509.rst
parent62c91ebe2bb715c4f572174a58e6367e414cba85 (diff)
downloadcryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.tar.gz
cryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.tar.bz2
cryptography-31e398802c79d3b4a182b28f17b99595e84bbe2a.zip
rename request to CSR
Diffstat (limited to 'docs/x509.rst')
-rw-r--r--docs/x509.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index 2ff12902..7f681ead 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -77,10 +77,10 @@ Loading Certificates
>>> cert.serial
2
-Loading Certificate Requests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Loading CSRs
+~~~~~~~~~~~~
-.. function:: load_pem_x509_request(data, backend)
+.. function:: load_pem_x509_csr(data, backend)
.. versionadded:: 0.9
@@ -95,7 +95,7 @@ Loading Certificate Requests
:class:`~cryptography.hazmat.backends.interfaces.X509Backend`
interface.
- :returns: An instance of :class:`~cryptography.x509.Request`.
+ :returns: An instance of :class:`~cryptography.x509.CSR`.
.. testsetup::
@@ -125,7 +125,7 @@ Loading Certificate Requests
>>> from cryptography import x509
>>> from cryptography.hazmat.backends import default_backend
>>> from cryptography.hazmat.primitives import hashes
- >>> request = x509.load_pem_x509_request(pem_req_data, default_backend())
+ >>> request = x509.load_pem_x509_csr(pem_req_data, default_backend())
>>> isinstance(request.signature_hash_algorithm, hashes.SHA1)
True
@@ -263,10 +263,10 @@ X.509 Certificate Object
... print(ext)
<Extension(oid=<ObjectIdentifier(oid=2.5.29.19, name=basicConstraints)>, critical=True, value=<BasicConstraints(ca=True, path_length=None)>)>
-X.509 Certificate Request Object
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+X.509 CSR Object
+~~~~~~~~~~~~~~~~
-.. class:: Request
+.. class:: CSR
.. versionadded:: 0.9