diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 16:26:03 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 16:26:03 -0500 |
| commit | e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c (patch) | |
| tree | 6ec2130d8ac42a20f59e93dfdffd32294e74783f /docs/hazmat | |
| parent | 4f034181c870030ed5f2c67e830bc1ae67176f41 (diff) | |
| parent | 458c09bdb2be4d39b8897db790349cc89faf3e6c (diff) | |
| download | cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.tar.gz cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.tar.bz2 cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.zip | |
Merge pull request #958 from public/openssl-loading-backend-iface
Rename OpenSSLSerializationBackend
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 0349901a..11ff9305 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -276,7 +276,7 @@ A specific ``backend`` may provide one or more of these interfaces. provider. -.. class:: OpenSSLSerializationBackend +.. class:: TraditionalOpenSSLSerializationBackend .. versionadded:: 0.3 @@ -290,8 +290,8 @@ A specific ``backend`` may provide one or more of these interfaces. :param bytes password: The password to use if this data is encrypted. Should be None if the data is not encrypted. - :return: A new instance of - :class:`~cryptography.hazmat.primitives.serialization.OpenSSLPrivateKey` + :return: A new instance of the appropriate private key or public key + that the serialized data contains. :raises ValueError: If the data could not be deserialized correctly. |