diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-24 13:20:15 -1000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-06-24 19:20:15 -0400 |
| commit | 2748e2e4ae923c3d2c29a3a31a702fb85ade0fff (patch) | |
| tree | 61be2e956ad62163b4f8242d883f6d9c641ce00e /docs | |
| parent | 1b714f7ed673c9a211f3b664e7df39d0f5f21e32 (diff) | |
| download | cryptography-2748e2e4ae923c3d2c29a3a31a702fb85ade0fff.tar.gz cryptography-2748e2e4ae923c3d2c29a3a31a702fb85ade0fff.tar.bz2 cryptography-2748e2e4ae923c3d2c29a3a31a702fb85ade0fff.zip | |
Reorganize DHParameters and DHPublicKey *WithSerialization (#3722)
* Reorganize DHParameters and DHPublicKey *WithSerialization
fixes #3720
* fix up the changelog
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/dh.rst | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/docs/hazmat/primitives/asymmetric/dh.rst b/docs/hazmat/primitives/asymmetric/dh.rst index 2e894dba..f97a328b 100644 --- a/docs/hazmat/primitives/asymmetric/dh.rst +++ b/docs/hazmat/primitives/asymmetric/dh.rst @@ -102,13 +102,6 @@ Group parameters :return: An instance of :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHPrivateKey`. - -.. class:: DHParametersWithSerialization - - .. versionadded:: 0.9 - - Inherits from :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHParameters`. - .. method:: parameter_numbers() Return the numbers that make up this set of parameters. @@ -135,6 +128,12 @@ Group parameters :return bytes: Serialized parameters. +.. class:: DHParametersWithSerialization + + .. versionadded:: 0.9 + + Alias for :class:`DHParameters`. + Key interfaces ~~~~~~~~~~~~~~ @@ -163,7 +162,7 @@ Key interfaces .. versionadded:: 1.7 - :param DHPublicKeyWithSerialization peer_public_key: The public key for + :param DHPublicKey peer_public_key: The public key for the peer. :return bytes: The agreed key. The bytes are ordered in 'big' endian. @@ -224,13 +223,6 @@ Key interfaces :return: A :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHParameters`. - -.. class:: DHPublicKeyWithSerialization - - .. versionadded:: 0.9 - - Inherits from :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHPublicKey`. - .. method:: public_numbers() Return the numbers that make up this public key. @@ -256,6 +248,12 @@ Key interfaces :return bytes: Serialized key. +.. class:: DHPublicKeyWithSerialization + + .. versionadded:: 0.9 + + Alias for :class:`DHPublicKey`. + Numbers ~~~~~~~ |