Skip to content

Commit c797071

Browse files
vstinnerclin1234
andcommitted
pythongh-148600: Add OpenSSL 4.0.0 support to test configurations (python#149356)
Co-authored-by: Charlie Lin <tuug@gmx.us> (cherry picked from commit fc96028)
1 parent 276bd2f commit c797071

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
@@ -310,6 +310,7 @@ jobs:
310310
- { name: openssl, version: 3.4.5 }
311311
- { name: openssl, version: 3.5.6 }
312312
- { name: openssl, version: 3.6.2 }
313+
- { name: openssl, version: 4.0.0 }
313314
env:
314315
SSLLIB_VER: ${{ matrix.ssllib.version }}
315316
MULTISSL_DIR: ${{ github.workspace }}/multissl

Lib/test/test_poplib.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ def _do_tls_handshake(self):
184184
elif err.args[0] == ssl.SSL_ERROR_EOF:
185185
return self.handle_close()
186186
# TODO: SSLError does not expose alert information
187-
elif ("SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1] or
187+
elif ("TLS_ALERT_BAD_CERTIFICATE" in err.args[1] or
188+
"SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1] or
188189
"SSLV3_ALERT_CERTIFICATE_UNKNOWN" in err.args[1]):
189190
return self.handle_close()
190191
raise
@@ -415,6 +416,7 @@ def test_stls_context(self):
415416
self.assertEqual(ctx.check_hostname, True)
416417
with self.assertRaises(ssl.CertificateError):
417418
resp = self.client.stls(context=ctx)
419+
418420
self.client = poplib.POP3("localhost", self.server.port,
419421
timeout=test_support.LOOPBACK_TIMEOUT)
420422
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)