diff options
| -rw-r--r-- | cryptography/hazmat/primitives/asymmetric/dsa.py | 12 | ||||
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/dsa.rst | 9 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_dsa.py | 23 |
3 files changed, 5 insertions, 39 deletions
diff --git a/cryptography/hazmat/primitives/asymmetric/dsa.py b/cryptography/hazmat/primitives/asymmetric/dsa.py index 38012e51..e8c587e9 100644 --- a/cryptography/hazmat/primitives/asymmetric/dsa.py +++ b/cryptography/hazmat/primitives/asymmetric/dsa.py @@ -234,20 +234,14 @@ class DSAPublicNumbers(object): class DSAPrivateNumbers(object): - def __init__(self, x, public_numbers, parameter_numbers): + def __init__(self, x, public_numbers): if not isinstance(x, six.integer_types): raise TypeError("DSAPrivateNumbers x argument must be an integer.") - if not isinstance(parameter_numbers, DSAParameterNumbers): - raise TypeError( - "parameter_numbers must be a DSAParameterNumbers instance." - ) - if not isinstance(public_numbers, DSAPublicNumbers): raise TypeError( "public_numbers must be a DSAPublicNumbers instance." ) - self._parameter_numbers = parameter_numbers self._public_numbers = public_numbers self._x = x @@ -256,9 +250,5 @@ class DSAPrivateNumbers(object): return self._x @property - def parameter_numbers(self): - return self._parameter_numbers - - @property def public_numbers(self): return self._public_numbers diff --git a/docs/hazmat/primitives/asymmetric/dsa.rst b/docs/hazmat/primitives/asymmetric/dsa.rst index 713fdeb8..ea913dd3 100644 --- a/docs/hazmat/primitives/asymmetric/dsa.rst +++ b/docs/hazmat/primitives/asymmetric/dsa.rst @@ -253,7 +253,7 @@ DSA The :class:`~cryptography.hazmat.primitives.dsa.DSAParameterNumbers` associated with the public key. -.. class:: DSAPrivateNumbers(x, public_numbers, parameter_numbers) +.. class:: DSAPrivateNumbers(x, public_numbers) .. versionadded:: 0.5 @@ -277,13 +277,6 @@ DSA The :class:`~cryptography.hazmat.primitives.dsa.DSAPublicNumbers` associated with the private key. - .. attribute:: parameter_numbers - - :type: :class:`~cryptography.hazmat.primitives.dsa.DSAParameterNumbers` - - The :class:`~cryptography.hazmat.primitives.dsa.DSAParameterNumbers` - associated with the public key. - .. _`DSA`: https://en.wikipedia.org/wiki/Digital_Signature_Algorithm .. _`public-key`: https://en.wikipedia.org/wiki/Public-key_cryptography .. _`FIPS 186-4`: http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py index 37489434..51a03c48 100644 --- a/tests/hazmat/primitives/test_dsa.py +++ b/tests/hazmat/primitives/test_dsa.py @@ -916,12 +916,10 @@ class TestDSANumbers(object): ) private_numbers = dsa.DSAPrivateNumbers( x=5, - public_numbers=public_numbers, - parameter_numbers=parameter_numbers + public_numbers=public_numbers ) assert private_numbers.x == 5 assert private_numbers.public_numbers == public_numbers - assert private_numbers.parameter_numbers == parameter_numbers def test_dsa_private_numbers_invalid_types(self): parameter_numbers = dsa.DSAParameterNumbers(p=1, q=2, g=3) @@ -930,22 +928,7 @@ class TestDSANumbers(object): parameter_numbers=parameter_numbers ) with pytest.raises(TypeError): - dsa.DSAPrivateNumbers( - x=4, - public_numbers=public_numbers, - parameter_numbers=None - ) + dsa.DSAPrivateNumbers(x=4, public_numbers=None) with pytest.raises(TypeError): - dsa.DSAPrivateNumbers( - x=4, - public_numbers=None, - parameter_numbers=parameter_numbers - ) - - with pytest.raises(TypeError): - dsa.DSAPrivateNumbers( - x=None, - public_numbers=public_numbers, - parameter_numbers=parameter_numbers - ) + dsa.DSAPrivateNumbers(x=None, public_numbers=public_numbers) |