From 3654d2fb628621b49b8ae269bd23b71e1728e1e0 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 30 Sep 2014 09:15:29 -0500 Subject: remove deprecated DSA classes/methods and update tests --- tests/hazmat/backends/test_openssl.py | 36 ++++++++--------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) (limited to 'tests/hazmat/backends/test_openssl.py') diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index b3a17884..94b5818e 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -175,20 +175,22 @@ class TestOpenSSL(object): ) def test_large_key_size_on_old_openssl(self): with pytest.raises(ValueError): - dsa.DSAParameters.generate(2048, backend=backend) + dsa.generate_parameters(2048, backend=backend) with pytest.raises(ValueError): - dsa.DSAParameters.generate(3072, backend=backend) + dsa.generate_parameters(3072, backend=backend) @pytest.mark.skipif( backend._lib.OPENSSL_VERSION_NUMBER < 0x1000000f, reason="Requires a newer OpenSSL. Must be >= 1.0.0" ) def test_large_key_size_on_new_openssl(self): - parameters = dsa.DSAParameters.generate(2048, backend) - assert utils.bit_length(parameters.p) == 2048 - parameters = dsa.DSAParameters.generate(3072, backend) - assert utils.bit_length(parameters.p) == 3072 + parameters = dsa.generate_parameters(2048, backend) + param_num = parameters.parameter_numbers() + assert utils.bit_length(param_num.p) == 2048 + parameters = dsa.generate_parameters(3072, backend) + param_num = parameters.parameter_numbers() + assert utils.bit_length(param_num.p) == 3072 def test_int_to_bn(self): value = (2 ** 4242) - 4242 @@ -502,28 +504,6 @@ class TestOpenSSLEllipticCurve(object): _sn_to_elliptic_curve(backend, b"fake") -class TestDeprecatedDSABackendMethods(object): - def test_create_dsa_signature_ctx(self): - params = dsa.DSAParameters.generate(1024, backend) - key = dsa.DSAPrivateKey.generate(params, backend) - pytest.deprecated_call( - backend.create_dsa_signature_ctx, - key, - hashes.SHA1() - ) - - def test_create_dsa_verification_ctx(self): - params = dsa.DSAParameters.generate(1024, backend) - key = dsa.DSAPrivateKey.generate(params, backend) - public_key = key.public_key() - pytest.deprecated_call( - backend.create_dsa_verification_ctx, - public_key, - b"\x00" * 128, - hashes.SHA1() - ) - - @pytest.mark.elliptic class TestDeprecatedECBackendMethods(object): def test_elliptic_curve_private_key_from_numbers(self): -- cgit v1.2.3