From 2748e2e4ae923c3d2c29a3a31a702fb85ade0fff Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 24 Jun 2017 13:20:15 -1000 Subject: Reorganize DHParameters and DHPublicKey *WithSerialization (#3722) * Reorganize DHParameters and DHPublicKey *WithSerialization fixes #3720 * fix up the changelog --- src/cryptography/hazmat/primitives/asymmetric/dh.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/primitives/asymmetric/dh.py b/src/cryptography/hazmat/primitives/asymmetric/dh.py index fc1317f0..92a493a0 100644 --- a/src/cryptography/hazmat/primitives/asymmetric/dh.py +++ b/src/cryptography/hazmat/primitives/asymmetric/dh.py @@ -129,9 +129,6 @@ class DHParameters(object): Returns the parameters serialized as bytes. """ - -@six.add_metaclass(abc.ABCMeta) -class DHParametersWithSerialization(DHParameters): @abc.abstractmethod def parameter_numbers(self): """ @@ -139,6 +136,9 @@ class DHParametersWithSerialization(DHParameters): """ +DHParametersWithSerialization = DHParameters + + @six.add_metaclass(abc.ABCMeta) class DHPrivateKey(object): @abc.abstractproperty @@ -196,9 +196,6 @@ class DHPublicKey(object): The DHParameters object associated with this public key. """ - -@six.add_metaclass(abc.ABCMeta) -class DHPublicKeyWithSerialization(DHPublicKey): @abc.abstractmethod def public_numbers(self): """ @@ -210,3 +207,6 @@ class DHPublicKeyWithSerialization(DHPublicKey): """ Returns the key serialized as bytes. """ + + +DHPublicKeyWithSerialization = DHPublicKey -- cgit v1.2.3