diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-01 11:32:34 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-01 11:32:34 -0500 |
| commit | 4741a3c2604497fabccb7af166937bb868d74ba3 (patch) | |
| tree | 597bf3f672f8a7ca2867741060f2be110315ae1c | |
| parent | d9c7eeba36a80bfaafaa463ce2cc1bb7f6b9d52a (diff) | |
| parent | d3a17c865f6615c682bebe3be9c566b91b66ceb4 (diff) | |
| download | cryptography-4741a3c2604497fabccb7af166937bb868d74ba3.tar.gz cryptography-4741a3c2604497fabccb7af166937bb868d74ba3.tar.bz2 cryptography-4741a3c2604497fabccb7af166937bb868d74ba3.zip | |
Merge pull request #2618 from reaperhulk/fix-2432
provide a bit more detail about the underlying public key formats
| -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 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. |