8000 OpenSSL 3.0.0: Fix test_session · openSUSE-Python/cpython@9b52247 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9b52247

Browse files
stratakismcepl
authored andcommitted
OpenSSL 3.0.0: Fix test_session
Utilize an sni name and do not use TLS 1.3 (cherry picked from commit gh#stratakis/cpython@07bfb93) From-PR: gh#fedora-python/cpython!75 Patch: openssl-300-fix-test_session.patch
1 parent 9652b9d commit 9b52247

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Lib/test/test_ssl.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3658,8 +3658,12 @@ def test_session(self):
36583658
client_context.verify_mode = ssl.CERT_REQUIRED
36593659
client_context.load_verify_locations(SIGNING_CA)
36603660

3661+
# Sessions are not compatible with TLS 1.3
3662+
client_context.options |= ssl.OP_NO_TLSv1_3
3663+
36613664
# first connection without session
3662-
stats = server_params_test(client_context, server_context)
3665+
stats = server_params_test(client_context, server_context,
3666+
sni_name='localhost')
36633667
session = stats['session']
36643668
self.assertTrue(session.id)
36653669
self.assertGreater(session.time, 0)
@@ -3673,7 +3677,8 @@ def test_session(self):
36733677
self.assertEqual(sess_stat['hits'], 0)
36743678

36753679
# reuse session
3676-
stats = server_params_test(client_context, server_context, session=session)
3680+
stats = server_params_test(client_context, server_context,
3681+
session=session, sni_name='localhost')
36773682
sess_stat = server_context.session_stats()
36783683
self.assertEqual(sess_stat['accept'], 2)
36793684
self.assertEqual(sess_stat['hits'], 1)
@@ -3686,7 +3691,8 @@ def test_session(self):
36863691
self.assertGreaterEqual(session2.timeout, session.timeout)
36873692

36883693
# another one without session
3689-
stats = server_params_test(client_context, server_context)
3694+
stats = server_params_test(client_context, server_context,
3695+
sni_name='localhost')
36903696
self.assertFalse(stats['session_reused'])
36913697
session3 = stats['session']
36923698
self.assertNotEqual(session3.id, session.id)
@@ -3696,7 +3702,8 @@ def test_session(self):
36963702
self.assertEqual(sess_stat['hits'], 1)
36973703

36983704
# reuse session again
3699-
stats = server_params_test(client_context, server_context, session=session)
3705+
stats = server_params_test(client_context, server_context,
3706+
session=session, sni_name='localhost')
37003707
self.assertTrue(stats['session_reused'])
37013708
session4 = stats['session']
37023709
self.assertEqual(session4.id, session.id)

0 commit comments

Comments
 (0)
0