Merge pull request #1132 from public/opaque-dsa-interfaces

Remove numbers from DSA interfaces

2 files changed, 1 insertions, 123 deletions

diff --git a/cryptography/hazmat/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py
index c375ce9a..ef8640c2 100644
--- a/cryptography/hazmat/primitives/interfaces.py
+++ b/cryptography/hazmat/primitives/interfaces.py
@@ -251,49 +251,7 @@ class RSAPublicKeyWithNumbers(RSAPublicKey):
 
 @six.add_metaclass(abc.ABCMeta)
 class DSAParameters(object):
-    @abc.abstractproperty
-    def modulus(self):
-        """
-        The prime modulus that's used in generating the DSA keypair and used
-        in the DSA signing and verification processes.
-        """
-
-    @abc.abstractproperty
-    def subgroup_order(self):
-        """
-        The subgroup order that's used in generating the DSA keypair
-        by the generator and used in the DSA signing and verification
-        processes.
-        """
-
-    @abc.abstractproperty
-    def generator(self):
-        """
-        The generator that is used in generating the DSA keypair and used
-        in the DSA signing and verification processes.
-        """
-
-    @abc.abstractproperty
-    def p(self):
-        """
-        The prime modulus that's used in generating the DSA keypair and used
-        in the DSA signing and verification processes. Alias for modulus.
-        """
-
-    @abc.abstractproperty
-    def q(self):
-        """
-        The subgroup order that's used in generating the DSA keypair
-        by the generator and used in the DSA signing and verification
-        processes. Alias for subgroup_order.
-        """
-
-    @abc.abstractproperty
-    def g(self):
-        """
-        The generator that is used in generating the DSA keypair and used
-        in the DSA signing and verification processes. Alias for generator.
-        """
+    pass
 
 
 @six.add_metaclass(abc.ABCMeta)
@@ -319,18 +277,6 @@ class DSAPrivateKey(object):
         The DSAPublicKey associated with this private key.
         """
 
-    @abc.abstractproperty
-    def x(self):
-        """
-        The private key "x" in the DSA structure.
-        """
-
-    @abc.abstractproperty
-    def y(self):
-        """
-        The public key.
-        """
-
     @abc.abstractmethod
     def parameters(self):
         """
@@ -355,12 +301,6 @@ class DSAPublicKey(object):
         The bit length of the prime modulus.
         """
 
-    @abc.abstractproperty
-    def y(self):
-        """
-        The public key.
-        """
-
     @abc.abstractmethod
     def parameters(self):
         """
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index 0c456326..755cef41 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -282,50 +282,6 @@ DSA
 
     `DSA`_ parameters.
 
-    .. attribute:: modulus
-
-        :type: int
-
-        The prime modulus that is used in generating the DSA key pair and used
-        in the DSA signing and verification processes.
-
-    .. attribute:: subgroup_order
-
-        :type: int
-
-        The subgroup order that is used in generating the DSA key pair
-        by the generator and used in the DSA signing and verification
-        processes.
-
-    .. attribute:: generator
-
-        :type: int
-
-        The generator that is used in generating the DSA key pair and used
-        in the DSA signing and verification processes.
-
-    .. attribute:: p
-
-        :type: int
-
-        The prime modulus that is used in generating the DSA key pair and used
-        in the DSA signing and verification processes. Alias for :attr:`modulus`.
-
-    .. attribute:: q
-
-        :type: int
-
-        The subgroup order that is used in generating the DSA key pair
-        by the generator and used in the DSA signing and verification
-        processes. Alias for :attr:`subgroup_order`.
-
-    .. attribute:: g
-
-        :type: int
-
-        The generator that is used in generating the DSA key pair and used
-        in the DSA signing and verification processes. Alias for :attr:`generator`.
-
 
 .. class:: DSAParametersWithNumbers
 
@@ -385,18 +341,6 @@ DSA
 
         The bit length of the modulus.
 
-    .. attribute:: x
-
-        :type: int
-
-        The private key.
-
-    .. attribute:: y
-
-        :type: int
-
-        The public key.
-
 
 .. class:: DSAPrivateKeyWithNumbers
 
@@ -427,12 +371,6 @@ DSA
 
         The bit length of the modulus.
 
-    .. attribute:: y
-
-        :type: int
-
-        The public key.
-
     .. method:: parameters()
 
         :return: :class:`~cryptography.hazmat.primitives.interfaces.DSAParameters`