diff options
| author | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
|---|---|---|
| committer | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
| commit | c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8 (patch) | |
| tree | d3ed0f8b77f4f978ee847585e5b1ae1a9994270b /docs/hazmat/primitives/asymmetric/serialization.rst | |
| parent | c219b962f8f02f85edf2a3452fe4136b1211f807 (diff) | |
| parent | 018a9659924c5ffe548d716295a4292c6929c341 (diff) | |
| download | cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.gz cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.bz2 cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.zip | |
Merge branch 'master' into crl_ossl_backend
Diffstat (limited to 'docs/hazmat/primitives/asymmetric/serialization.rst')
| -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. |