diff options
| author | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 00:32:25 +0100 |
|---|---|---|
| committer | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 08:39:11 +0100 |
| commit | 5e80fcc5765b920dce51b03dda5f090b02cd3ebb (patch) | |
| tree | e7bca30c8d46d7eb37bc761b30604f2fb11f2709 /docs/hazmat/backends | |
| parent | b72f0f192146221b0613831e828694fb769834b2 (diff) | |
| download | cryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.tar.gz cryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.tar.bz2 cryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.zip | |
Added all changes lost in merge reset
Diffstat (limited to 'docs/hazmat/backends')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 6 |
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 |