diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-26 17:23:38 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-26 17:23:38 -0500 |
| commit | 28edb8fc4b045fc30a67e9c25817eeedd11ab78a (patch) | |
| tree | f65811dcf16936fc3464c2ff82a2d3046669b2e3 /docs/hazmat | |
| parent | b818818d51f01994d2deeec2af587eb9936795d8 (diff) | |
| parent | 281d6b255836538a15fc4957fe9e561a507f93d1 (diff) | |
| download | cryptography-28edb8fc4b045fc30a67e9c25817eeedd11ab78a.tar.gz cryptography-28edb8fc4b045fc30a67e9c25817eeedd11ab78a.tar.bz2 cryptography-28edb8fc4b045fc30a67e9c25817eeedd11ab78a.zip | |
Merge pull request #1356 from alex/docs-cleanup
Slight clarification of the load_pem_public_key docs
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 18b89c44..b86fab64 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -107,8 +107,8 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END :returns: A new instance of a public key. - :raises ValueError: If the PEM data could not be decrypted or if its - structure could not be decoded successfully. + :raises ValueError: If the PEM data's structure could not be decoded + successfully. :raises UnsupportedAlgorithm: If the serialized key is of a type that is not supported by the backend. |