Merge pull request #2413 from ddcc/master
extend pkcs7 openssl bindings
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index 87383db..97224c9 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -226,13 +226,13 @@
.. method:: public_key()
- :type:
+ The public key associated with the certificate.
+
+ :returns:
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
- The public key associated with the certificate.
-
.. doctest::
>>> from cryptography.hazmat.primitives.asymmetric import rsa
@@ -521,6 +521,8 @@
:class:`~cryptography.hazmat.backends.interfaces.X509Backend`
interface.
+ :returns: :class:`~cryptography.x509.Certificate`
+
X.509 CSR (Certificate Signing Request) Object
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -531,13 +533,13 @@
.. method:: public_key()
- :type:
+ The public key associated with the request.
+
+ :returns:
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
- The public key associated with the request.
-
.. doctest::
>>> from cryptography.hazmat.primitives.asymmetric import rsa