diff options
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | docs/x509.rst | 8 | ||||
| -rw-r--r-- | src/cryptography/hazmat/backends/multibackend.py | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9d68d139..448f7f0c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,7 +18,7 @@ Changelog :class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPrivateKeyWithSerialization`, and :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePrivateKeyWithSerialization`. -* Add support for parsing X.509 requests with +* Add support for parsing X.509 CSRs (certificate signing requests) with :func:`~cryptography.x509.load_pem_x509_csr`. 0.8.1 - 2015-03-20 diff --git a/docs/x509.rst b/docs/x509.rst index 7f681ead..03301c22 100644 --- a/docs/x509.rst +++ b/docs/x509.rst @@ -84,8 +84,8 @@ Loading CSRs .. versionadded:: 0.9 - Deserialize a certificate request from PEM encoded data. PEM requests are - base64 decoded and have delimiters that look like + Deserialize a certificate signing request from PEM encoded data. PEM + requests are base64 decoded and have delimiters that look like ``-----BEGIN CERTIFICATE REQUEST-----``. This is also known as PKCS#10 format. @@ -263,8 +263,8 @@ X.509 Certificate Object ... print(ext) <Extension(oid=<ObjectIdentifier(oid=2.5.29.19, name=basicConstraints)>, critical=True, value=<BasicConstraints(ca=True, path_length=None)>)> -X.509 CSR Object -~~~~~~~~~~~~~~~~ +X.509 CSR (Certificate Signing Request) Object +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. class:: CSR diff --git a/src/cryptography/hazmat/backends/multibackend.py b/src/cryptography/hazmat/backends/multibackend.py index 86ddc3b1..54b044f0 100644 --- a/src/cryptography/hazmat/backends/multibackend.py +++ b/src/cryptography/hazmat/backends/multibackend.py @@ -326,9 +326,7 @@ class MultiBackend(object): ) def load_pem_x509_csr(self, data): - for b in self._filtered_backends( - X509Backend - ): + for b in self._filtered_backends(X509Backend): return b.load_pem_x509_csr(data) raise UnsupportedAlgorithm( |