aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/backends
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-26 15:43:47 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-26 15:43:47 -0500
commit58f63ed781b73478ee3fe60ebe1cfdfd85df5186 (patch)
tree32673233373345e277af0176a46351841e46d0c1 /docs/hazmat/backends
parent0520a2512d461b100ce1988ad094f76a219528b5 (diff)
parentebba1b0db3975c81742e8092619133fe2349124e (diff)
downloadcryptography-58f63ed781b73478ee3fe60ebe1cfdfd85df5186.tar.gz
cryptography-58f63ed781b73478ee3fe60ebe1cfdfd85df5186.tar.bz2
cryptography-58f63ed781b73478ee3fe60ebe1cfdfd85df5186.zip
Merge pull request #1331 from michael-hart/public_key_pem
Add support for .PEM public keys, with tests and docs
Diffstat (limited to 'docs/hazmat/backends')
-rw-r--r--docs/hazmat/backends/interfaces.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index f8341d11..e8e1bac2 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -595,6 +595,12 @@ A specific ``backend`` may provide one or more of these interfaces.
:raises cryptography.exceptions.UnsupportedAlgorithm: If the data is
encrypted with an unsupported algorithm.
+ .. method:: load_pem_public_key(data)
+
+ :param bytes data: PEM data to load.
+ :return: A new instance of the appropriate type of public key serialized data contains.
+ :raises ValueError: If the data could not be deserialized.
+
.. class:: TraditionalOpenSSLSerializationBackend
.. versionadded:: 0.3