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 /src | |
| 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 'src')
| -rw-r--r-- | src/cryptography/hazmat/primitives/asymmetric/dh.py | 12 |
1 files changed, 6 insertions, 6 deletions
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 |