aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-26 09:43:45 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-26 11:36:10 -0500
commita9732f587b97986b76afb1e942743067623de45e (patch)
tree9ce25871b856ef72f4cbe1b3ab2055ac5c7b3d5d /docs/hazmat
parent8f768dc5b9eda26510b3ffc6be862ea3e8f4a0b4 (diff)
downloadcryptography-a9732f587b97986b76afb1e942743067623de45e.tar.gz
cryptography-a9732f587b97986b76afb1e942743067623de45e.tar.bz2
cryptography-a9732f587b97986b76afb1e942743067623de45e.zip
add two missing methods to backend interface docs
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/backends/interfaces.rst31
1 files changed, 31 insertions, 0 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index 4da0d753..fb3786c3 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -519,6 +519,37 @@ A specific ``backend`` may provide one or more of these interfaces.
:returns: An instance of
:class:`~cryptography.x509.CertificateSigningRequest`.
+ .. method:: load_der_x509_csr(data)
+
+ .. versionadded:: 0.9
+
+ :param bytes data: DER formatted certificate signing request data.
+
+ :returns: An instance of
+ :class:`~cryptography.x509.CertificateSigningRequest`.
+
+ .. method:: create_x509_csr(builder, private_key, algorithm)
+
+ .. versionadded:: 1.0
+
+ :param builder: An instance of
+ :class:`~cryptography.x509.CertificateSigningRequestBuilder`.
+
+ :param private_key: The
+ :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKey`,
+ :class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPrivateKey` or
+ :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePrivateKey`
+ that will be used to sign the request. When the request is
+ signed by a certificate authority, the private key's associated
+ public key will be stored in the resulting certificate.
+
+ :param algorithm: The
+ :class:`~cryptography.hazmat.primitives.hashes.HashAlgorithm`
+ that will be used to generate the request signature.
+
+ :returns: A new object with the
+ :class:`~cryptography.x509.CertificateSigningRequest` interface.
+
.. class:: DHBackend