diff options
| author | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
|---|---|---|
| committer | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
| commit | c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8 (patch) | |
| tree | d3ed0f8b77f4f978ee847585e5b1ae1a9994270b /docs/x509 | |
| parent | c219b962f8f02f85edf2a3452fe4136b1211f807 (diff) | |
| parent | 018a9659924c5ffe548d716295a4292c6929c341 (diff) | |
| download | cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.gz cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.bz2 cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.zip | |
Merge branch 'master' into crl_ossl_backend
Diffstat (limited to 'docs/x509')
| -rw-r--r-- | docs/x509/reference.rst | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index eec0cbcc..5ab6caa5 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -287,13 +287,13 @@ X.509 Certificate Object .. 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 @@ -617,6 +617,8 @@ X.509 Certificate Builder :class:`~cryptography.hazmat.backends.interfaces.X509Backend` interface. + :returns: :class:`~cryptography.x509.Certificate` + X.509 CSR (Certificate Signing Request) Object ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -627,13 +629,13 @@ X.509 CSR (Certificate Signing Request) Object .. 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 |