aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-05 13:52:11 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-05 13:52:11 -0500
commit026530a1f54a3180b56cc5d330283ea182db1249 (patch)
tree53b4cf073bf7796f9302ed45c263e1e60d344d69
parentf97797941659b86bac821fd85c773ff628144a83 (diff)
parentd0b376bc3bf7f9cf1fbdf74762ac095db41c2a3a (diff)
downloadcryptography-026530a1f54a3180b56cc5d330283ea182db1249.tar.gz
cryptography-026530a1f54a3180b56cc5d330283ea182db1249.tar.bz2
cryptography-026530a1f54a3180b56cc5d330283ea182db1249.zip
Merge pull request #2116 from alex/version-added-public-bytes
Document that public_bytes on certs and CSRs are new in 1.0
-rw-r--r--docs/x509.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index f94f50eb..a3cf7e25 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -328,6 +328,8 @@ X.509 Certificate Object
.. method:: public_bytes(encoding)
+ .. versionadded:: 1.0
+
:param encoding: The
:class:`~cryptography.hazmat.primitives.serialization.Encoding`
that will be used to serialize the certificate.
@@ -435,6 +437,8 @@ X.509 CSR (Certificate Signing Request) Object
.. method:: public_bytes(encoding)
+ .. versionadded:: 1.0
+
:param encoding: The
:class:`~cryptography.hazmat.primitives.serialization.Encoding`
that will be used to serialize the certificate request.