aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/backends/interfaces.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-06-24 10:12:04 -1000
committerAlex Gaynor <alex.gaynor@gmail.com>2017-06-24 16:12:04 -0400
commit361a9fc2b7ec3c41dbf479071fca87a2573e0c52 (patch)
tree98c80e28b742fc500c183f5cd3670949efab0113 /docs/hazmat/backends/interfaces.rst
parent6b08aba7f1eb296461528328a3c9871fa7594fc4 (diff)
downloadcryptography-361a9fc2b7ec3c41dbf479071fca87a2573e0c52.tar.gz
cryptography-361a9fc2b7ec3c41dbf479071fca87a2573e0c52.tar.bz2
cryptography-361a9fc2b7ec3c41dbf479071fca87a2573e0c52.zip
changelog entry and a few updates to the new DH params docs (#3718)
Diffstat (limited to 'docs/hazmat/backends/interfaces.rst')
-rw-r--r--docs/hazmat/backends/interfaces.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index 8ea1cf99..93eedbe6 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -457,7 +457,7 @@ A specific ``backend`` may provide one or more of these interfaces.
.. versionadded:: 2.0
:param bytes data: PEM data to load.
- :return: A new instance of the appropriate type of encryption
+ :return: A new instance of the appropriate type of asymmetric
parameters the serialized data contains.
:raises ValueError: If the data could not be deserialized.
@@ -490,7 +490,7 @@ A specific ``backend`` may provide one or more of these interfaces.
.. versionadded:: 2.0
:param bytes data: DER data to load.
- :return: A new instance of the appropriate type of encryption
+ :return: A new instance of the appropriate type of asymmetric
parameters the serialized data contains.
:raises ValueError: If the data could not be deserialized.