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 00:32:25 +0100 |
| commit | cd76c42245efd4dd4c779db28fde7de467493e13 (patch) | |
| tree | b9b6afc2d228fd5098c02dd077ab7ef7e914a00a /docs | |
| parent | a3204baf9bcfd2288d049c4f27e75c535b4397ed (diff) | |
| download | cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.tar.gz cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.tar.bz2 cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.zip | |
Added all changes lost in merge reset
Diffstat (limited to 'docs')
| -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 |