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 18:40:27 +0100 |
| commit | 801e8c1b88b77e9feb8ad57af166c4b52b15f22a (patch) | |
| tree | 0e5cabb33f221649e12de0a39fed9f2385d156d2 /docs | |
| parent | b45731b94d7a50b4b4ca39e6a571fc5c19f509b4 (diff) | |
| download | cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.gz cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.bz2 cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.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 |