Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[3.10] bpo-43921: Fix test_ssl.test_wrong_cert_tls13() on Windows (GH-26502) #26518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jun 3, 2021
Merged

[3.10] bpo-43921: Fix test_ssl.test_wrong_cert_tls13() on Windows (GH-26502) #26518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions 20 Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3194,7 +3194,8 @@ def test_wrong_cert_tls13(self):
)
with server, \
client_context.wrap_socket(socket.socket(),
server_hostname=hostname) as s:
server_hostname=hostname,
suppress_ragged_eofs=False) as s:
# TLS 1.3 perform client cert exchange after handshake
s.connect((HOST, server.port))
try:
Expand All @@ -3211,13 +3212,7 @@ def test_wrong_cert_tls13(self):
if support.verbose:
sys.stdout.write("\nsocket.error is %r\n" % e)
else:
if sys.platform == "win32":
self.skipTest(
"Ignoring failed test_wrong_cert_tls13 test case. "
"The test is flaky on Windows, see bpo-43921."
)
else:
self.fail("Use of invalid cert should have failed!")
self.fail("Use of invalid cert should have failed!")

def test_rude_shutdown(self):
"""A brutal shutdown of an SSL server should raise an OSError
Expand Down Expand Up @@ -4454,7 +4449,8 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
server = ThreadedEchoServer(context=server_context, chatty=True)
with server:
with client_context.wrap_socket(socket.socket(),
server_hostname=hostname) as s:
server_hostname=hostname,
suppress_ragged_eofs=False) as s:
s.connect((HOST, server.port))
s.write(b'PHA')
# test sometimes fails with EOF error. Test passes as long as
Expand All @@ -4465,17 +4461,13 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
):
# receive CertificateRequest
data = s.recv(1024)
if not data:
raise ssl.SSLError(1, "EOF occurred")
self.assertEqual(data, b'OK\n')

# send empty Certificate + Finish
s.write(b'HASCERT')

# receive alert
data = s.recv(1024)
if not data:
raise ssl.SSLError(1, "EOF occurred")
s.recv(1024)

def test_pha_optional(self):
if support.verbose:
Expand Down
3 changes: 3 additions & 0 deletions 3 Misc/NEWS.d/next/Tests/2021-06-03-03-29-34.bpo-43921.nwH1FS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix test_ssl.test_wrong_cert_tls13(): use ``suppress_ragged_eofs=False``,
since ``read()`` can raise :exc:`ssl.SSLEOFError` on Windows. Patch by
Victor Stinner.
Morty Proxy This is a proxified and sanitized view of the page, visit original site.