From 801e8c1b88b77e9feb8ad57af166c4b52b15f22a Mon Sep 17 00:00:00 2001
From: michael-hart <michael.hart1994@gmail.com>
Date: Fri, 26 Sep 2014 00:32:25 +0100
Subject: Added all changes lost in merge reset
---
docs/hazmat/backends/interfaces.rst | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'docs/hazmat/backends')
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
--
cgit v1.2.3