Commit 8459b66
committed
pythongh-109945 fix openssl<3 tests
Signed-off-by: Nigel Jones <jonesn@uk.ibm.com>1 parent af71eee commit 8459b66
1 file changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1375,12 +1375,15 @@ def test_set_ecdh_curve(self): | |||
| 1375 | 1375 | ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) | |
| 1376 | 1376 | ctx.set_ecdh_curve("prime256v1") | |
| 1377 | 1377 | 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") | ||
| 1380 | 1382 | self.assertRaises(TypeError, ctx.set_ecdh_curve) | |
| 1381 | 1383 | self.assertRaises(TypeError, ctx.set_ecdh_curve, None) | |
| 1382 | 1384 | self.assertRaises(ValueError, ctx.set_ecdh_curve, "foo") | |
| 1383 | 1385 | self.assertRaises(ValueError, ctx.set_ecdh_curve, b"foo") | |
| 1386 | + # Multiple bad curves should cause error for any OpenSSL version | ||
| 1384 | 1387 | self.assertRaises(ValueError, ctx.set_ecdh_curve, "foo:bar") | |
| 1385 | 1388 | self.assertRaises(ValueError, ctx.set_ecdh_curve, b"foo:bar") | |
| 1386 | 1389 | self.assertRaises(ValueError, ctx.set_ecdh_curve, "prime256v1:bar") | |
0 commit comments