test the names of the curves against the stored list

We were testing the wrong version of the curve string.  With this
change on python-cryptography 2.6.1 and openssl 1.1.1c, we drop from
26 xfailed to 14 xfailed tests.
This commit is contained in:
Daniel Kahn Gillmor
2019-07-17 02:47:44 -04:00
parent d8adc3287f
commit e0e516ed7f

View File

@@ -254,8 +254,8 @@ class TestPGPKey_Management(object):
if not alg.can_gen: if not alg.can_gen:
pytest.xfail('Key algorithm {} not yet supported'.format(alg.name)) pytest.xfail('Key algorithm {} not yet supported'.format(alg.name))
if isinstance(size, EllipticCurveOID) and ((not size.can_gen) or size.name not in _openssl_get_supported_curves()): if isinstance(size, EllipticCurveOID) and ((not size.can_gen) or size.curve.name not in _openssl_get_supported_curves()):
pytest.xfail('Curve {} not yet supported'.format(size.name)) pytest.xfail('Curve {} not yet supported'.format(size.curve.name))
key = self.keys[pkspec] key = self.keys[pkspec]
subkey = PGPKey.new(*skspec) subkey = PGPKey.new(*skspec)
@@ -465,8 +465,8 @@ class TestPGPKey_Management(object):
if not alg.can_gen: if not alg.can_gen:
pytest.xfail('Key algorithm {} not yet supported'.format(alg.name)) pytest.xfail('Key algorithm {} not yet supported'.format(alg.name))
if isinstance(size, EllipticCurveOID) and ((not size.can_gen) or size.name not in _openssl_get_supported_curves()): if isinstance(size, EllipticCurveOID) and ((not size.can_gen) or size.curve.name not in _openssl_get_supported_curves()):
pytest.xfail('Curve {} not yet supported'.format(size.name)) pytest.xfail('Curve {} not yet supported'.format(size.curve.name))
# revoke the subkey # revoke the subkey
key = self.keys[pkspec] key = self.keys[pkspec]