aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/asymmetric/dh.rst3
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst8
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/hazmat/primitives/asymmetric/dh.rst b/docs/hazmat/primitives/asymmetric/dh.rst
index 971d3452..2e894dba 100644
--- a/docs/hazmat/primitives/asymmetric/dh.rst
+++ b/docs/hazmat/primitives/asymmetric/dh.rst
@@ -130,7 +130,8 @@ Group parameters
:class:`~cryptography.hazmat.primitives.serialization.Encoding` enum.
:param format: A value from the
- :class:`~cryptography.hazmat.primitives.serialization.ParameterFormat` enum.
+ :class:`~cryptography.hazmat.primitives.serialization.ParameterFormat`
+ enum. At the moment only ``PKCS3`` is supported.
:return bytes: Serialized parameters.
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index b0cfbd0e..24e2b89c 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -199,8 +199,8 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END
.. versionadded:: 2.0
- Deserialize encryption parameters from PEM encoded data to one of the supported
- asymmetric encryption parameters types.
+ Deserialize parameters from PEM encoded data to one of the supported
+ asymmetric parameters types.
.. doctest::
@@ -317,8 +317,8 @@ the rest.
.. versionadded:: 2.0
- Deserialize encryption parameters from DER encoded data to one of the supported
- asymmetric encryption parameters types.
+ Deserialize parameters from DER encoded data to one of the supported
+ asymmetric parameters types.
:param bytes data: The DER encoded parameters data.