summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2016-01-22 18:42:13 +0000
committerCory Benfield <lukasaoz@gmail.com>2016-01-22 18:42:28 +0000
commit4d67d04bfc4c1e7706ef4c8962f05eb73cb430a1 (patch)
tree83d9391267637f15ef46935e51559d73d7042f44 /doc
parenta14f5eac223b04e92df706148f7d3c2a085a8550 (diff)
downloadpyopenssl-git-4d67d04bfc4c1e7706ef4c8962f05eb73cb430a1.tar.gz
Explain that FILETYPE_ASN1 is DER.
Diffstat (limited to 'doc')
-rw-r--r--doc/api/crypto.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst
index 41b659b..0568ad7 100644
--- a/doc/api/crypto.rst
+++ b/doc/api/crypto.rst
@@ -35,7 +35,12 @@ Serialization and deserialization
---------------------------------
The following serialization functions take one of these constants to
-determine the format:
+determine the format.
+
+:data:`FILETYPE_PEM` serializes data to a Base64-encoded encoded representation
+of the underlying ASN.1 data structure. :data:`FILETYPE_ASN1` serializes data
+to the underlying ASN.1 data structure. The format used by
+:data:`FILETYPE_ASN1` is also sometimes referred to as DER.
.. py:data:: FILETYPE_PEM
FILETYPE_ASN1