diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-04-23 20:58:37 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-04-25 21:30:57 +0100 |
| commit | 458c09bdb2be4d39b8897db790349cc89faf3e6c (patch) | |
| tree | fbd057d6ff05747cceb2138b4625bcff49e48fd6 /docs | |
| parent | 28091767ff7fdf80cb1d3ae45915949dfe9793b5 (diff) | |
| download | cryptography-458c09bdb2be4d39b8897db790349cc89faf3e6c.tar.gz cryptography-458c09bdb2be4d39b8897db790349cc89faf3e6c.tar.bz2 cryptography-458c09bdb2be4d39b8897db790349cc89faf3e6c.zip | |
Rename OpenSSLSerializationBackend
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 6 | ||||
| -rw-r--r-- | docs/spelling_wordlist.txt | 1 |
2 files changed, 4 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. diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index 02b9f9ef..aae52ae7 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -25,6 +25,7 @@ interoperable introspectability invariants iOS +metadata pickleable plaintext pseudorandom |