aboutsummaryrefslogtreecommitdiffstats
path: root/docs/x509/reference.rst
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2015-08-02 11:31:08 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2015-08-02 11:31:08 -0500
commit8f57142489a0d0d832b0ba7fa56eec84e1f00cc4 (patch)
tree78730684cb1f9623ba1d72e345b8cca82b745889 /docs/x509/reference.rst
parentb4a155d4e343a68ae0e53b728ae148dfab6a27d5 (diff)
downloadcryptography-8f57142489a0d0d832b0ba7fa56eec84e1f00cc4.tar.gz
cryptography-8f57142489a0d0d832b0ba7fa56eec84e1f00cc4.tar.bz2
cryptography-8f57142489a0d0d832b0ba7fa56eec84e1f00cc4.zip
Update the docs to be more accurate
Diffstat (limited to 'docs/x509/reference.rst')
-rw-r--r--docs/x509/reference.rst10
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index 2029c08f..ac07eade 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -411,7 +411,10 @@ X.509 Certificate Builder
Sets the subject's public key.
- :param public_key: The subject's public key.
+ :param public_key: The subject's public key. This can be one of
+ :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey`,
+ :class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
+ :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
.. method:: serial_number(serial_number)
@@ -448,8 +451,9 @@ X.509 Certificate Builder
Adds an X.509 extension to the certificate.
- :param extension: The :class:`~cryptography.x509.Extension` to add to
- the certificate.
+ :param extension: The extension to add to the certificate. Can be one
+ of :class:`~cryptography.x509.BasicConstraints` or
+ :class:`~cryptography.x509.SubjectAlternativeName`.
.. method:: sign(backend, private_key, algorithm)