aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-02-12 18:22:50 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-02-12 18:22:50 -0500
commita9c131789609d0d4340624435ae6ca794f225203 (patch)
tree8f751453962206bb53b24f59e519e1b1fa729f59 /docs/hazmat
parentb41c80b0cfa4fd9a14016c81557776cc01feedba (diff)
parent13b6aff79d8d776968e7613b962b36ac895750cd (diff)
downloadcryptography-a9c131789609d0d4340624435ae6ca794f225203.tar.gz
cryptography-a9c131789609d0d4340624435ae6ca794f225203.tar.bz2
cryptography-a9c131789609d0d4340624435ae6ca794f225203.zip
Merge pull request #1655 from reaperhulk/x509-interface-what
remove unused X509 certificate interface
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/backends/interfaces.rst6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index a2dd0c1c..e3dc96c0 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -502,12 +502,10 @@ A specific ``backend`` may provide one or more of these interfaces.
:param bytes data: PEM formatted certificate data.
- :returns: An instance of
- :class:`~cryptography.hazmat.primitives.interfaces.X509Certificate`.
+ :returns: An instance of :class:`~cryptography.x509.Certificate`.
.. method:: load_der_x509_certificate(data)
:param bytes data: DER formatted certificate data.
- :returns: An instance of
- :class:`~cryptography.hazmat.primitives.interfaces.X509Certificate`.
+ :returns: An instance of :class:`~cryptography.x509.Certificate`.