Skip to content

Commit fc96028

Browse files
vstinnerclin1234
andauthored
gh-148600: Add OpenSSL 4.0.0 support to test configurations (#149356)
Co-authored-by: Charlie Lin <tuug@gmx.us>
1 parent 7aedd0a commit fc96028

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ jobs:
283283
- { name: openssl, version: 3.4.5 }
284284
- { name: openssl, version: 3.5.6 }
285285
- { name: openssl, version: 3.6.2 }
286+
- { name: openssl, version: 4.0.0 }
286287
## AWS-LC
287288
- { name: aws-lc, version: 1.72.1 }
288289
env:

Lib/test/test_poplib.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ def _do_tls_handshake(self):
185185
elif err.args[0] == ssl.SSL_ERROR_EOF:
186186
return self.handle_close()
187187
# TODO: SSLError does not expose alert information
188-
elif ("SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1] or
188+
elif ("TLS_ALERT_BAD_CERTIFICATE" in err.args[1] or
189+
"SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1] or
189190
"SSLV3_ALERT_CERTIFICATE_UNKNOWN" in err.args[1]):
190191
return self.handle_close()
191192
raise
@@ -423,6 +424,7 @@ def test_stls_context(self):
423424
self.assertEqual(ctx.check_hostname, True)
424425
with self.assertRaises(ssl.CertificateError):
425426
resp = self.client.stls(context=ctx)
427+
426428
self.client = poplib.POP3("localhost", self.server.port,
427429
timeout=test_support.LOOPBACK_TIMEOUT)
428430
resp = self.client.stls(context=ctx)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add OpenSSL 4.0.0 support to test configurations.

Tools/ssl/multissltests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"3.4.5",
5555
"3.5.6",
5656
"3.6.2",
57+
"4.0.0",
5758
# See make_ssl_data.py for notes on adding a new version.
5859
]
5960

0 commit comments

Comments
 (0)