diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-17 09:33:27 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-17 09:33:27 -0500 |
| commit | 0d6a74ea07a599371faddc2e33d746484dbaf92b (patch) | |
| tree | 5a68db05f434c8ac333fd94aaebcfc0759912ba4 /docs/hazmat/primitives | |
| parent | 7a0ed4a7e9443a0506ae5373a8e5cd1ce3539e97 (diff) | |
| download | cryptography-0d6a74ea07a599371faddc2e33d746484dbaf92b.tar.gz cryptography-0d6a74ea07a599371faddc2e33d746484dbaf92b.tar.bz2 cryptography-0d6a74ea07a599371faddc2e33d746484dbaf92b.zip | |
make it clearer when PEM and DER encoding support was added
Diffstat (limited to 'docs/hazmat/primitives')
| -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..6d354dff 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. |