diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-19 07:52:06 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-19 07:52:06 -0400 |
| commit | c6951eec604e68eba1a08c98f2efc6261238774b (patch) | |
| tree | 5b08f9f8e3a9e5cb9489cfed4ad45528f8f07ac6 /docs | |
| parent | c3874bb8a96f8932422065a497251c0731288df6 (diff) | |
| parent | 943c7a8dc0d047c43109331ba79fa7b7bed36c03 (diff) | |
| download | cryptography-c6951eec604e68eba1a08c98f2efc6261238774b.tar.gz cryptography-c6951eec604e68eba1a08c98f2efc6261238774b.tar.bz2 cryptography-c6951eec604e68eba1a08c98f2efc6261238774b.zip | |
Merge pull request #2425 from reaperhulk/fix-encoding-der-added
make it clearer when PEM and DER encoding support was added
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 8d51f0d7..f14f4037 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -337,8 +337,6 @@ Serialization Encodings .. class:: Encoding - .. versionadded:: 0.8 - An enumeration for encoding types. Used with the ``private_bytes`` method available on :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKeyWithSerialization` @@ -353,10 +351,14 @@ Serialization Encodings .. attribute:: PEM + .. versionadded:: 0.8 + For PEM format. This is a base64 format with delimiters. .. attribute:: DER + .. versionadded:: 0.9 + For DER format. This is a binary format. |