aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-12-31 20:36:43 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-12-31 20:36:43 -0600
commitd3a17c865f6615c682bebe3be9c566b91b66ceb4 (patch)
tree3098970a10b3f8a9523787b74795bd18c3e99f4b /docs/hazmat
parent46f4ab064a4cfcaf330e9cb5a037ed44d9a36818 (diff)
downloadcryptography-d3a17c865f6615c682bebe3be9c566b91b66ceb4.tar.gz
cryptography-d3a17c865f6615c682bebe3be9c566b91b66ceb4.tar.bz2
cryptography-d3a17c865f6615c682bebe3be9c566b91b66ceb4.zip
provide a bit more detail about the underlying public key formats
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index 89028c8e..b94c0e10 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -141,7 +141,8 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END
.. versionadded:: 0.6
Deserialize a public key from PEM encoded data to one of the supported
- asymmetric public key types.
+ asymmetric public key types. The PEM encoded data is typically a
+ ``subjectPublicKeyInfo`` payload as specified in :rfc:`5280`.
.. doctest::
@@ -226,7 +227,8 @@ the rest.
.. versionadded:: 0.8
Deserialize a public key from DER encoded data to one of the supported
- asymmetric public key types.
+ asymmetric public key types. The DER encoded data is typically a
+ ``subjectPublicKeyInfo`` payload as specified in :rfc:`5280`.
:param bytes data: The DER encoded key data.