Skip to content

Commit cda6336

Browse files
committed
gh-109945 fix openssl<3 tests
Signed-off-by: Nigel Jones <[email protected]>
1 parent e2be1e1 commit cda6336

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Lib/test/test_ssl.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,12 +1375,15 @@ def test_set_ecdh_curve(self):
13751375
ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
13761376
ctx.set_ecdh_curve("prime256v1")
13771377
ctx.set_ecdh_curve(b"prime256v1")
1378-
ctx.set_ecdh_curve("prime256v1:brainpoolP384r1")
1379-
ctx.set_ecdh_curve(b"prime256v1:brainpoolP384r1")
1378+
# Only OpenSSL 3 and above supported for multiple curves
1379+
if (IS_OPENSSL_3_0_0 >= 3):
1380+
ctx.set_ecdh_curve("prime256v1:brainpoolP384r1")
1381+
ctx.set_ecdh_curve(b"prime256v1:brainpoolP384r1")
13801382
self.assertRaises(TypeError, ctx.set_ecdh_curve)
13811383
self.assertRaises(TypeError, ctx.set_ecdh_curve, None)
13821384
self.assertRaises(ValueError, ctx.set_ecdh_curve, "foo")
13831385
self.assertRaises(ValueError, ctx.set_ecdh_curve, b"foo")
1386+
# Multiple bad curves should cause error for any OpenSSL version
13841387
self.assertRaises(ValueError, ctx.set_ecdh_curve, "foo:bar")
13851388
self.assertRaises(ValueError, ctx.set_ecdh_curve, b"foo:bar")
13861389
self.assertRaises(ValueError, ctx.set_ecdh_curve, "prime256v1:bar")

0 commit comments

Comments
 (0)