From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:31:28 +0000 (+0200)
Subject: [3.12] gh-123700: Update OpenSSL versions in multissltests and CI (GH-123704)
X-Git-Tag: v3.12.6~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e75ecd0b424f2218e0591ae251a09365dcc4e731;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-123700: Update OpenSSL versions in multissltests and CI (GH-123704)

Remove EOL 1.1.1w from CI and move it to the 'old' set in multissltests,
add latest 3.3.2 to both CI and multissltests.

(cherry picked from commit d83e30caddcbf9482273743d287577517ec735b7)

Co-authored-by: Zachary Ware <zach@python.org>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ec619186139..b1c8672af4e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -255,7 +255,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
+        openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 1d5a64a84883..2cab972a5f8e 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -43,13 +43,14 @@ import tarfile
 log = logging.getLogger("multissl")
 
 OPENSSL_OLD_VERSIONS = [
+    "1.1.1w",
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1w",
     "3.0.15",
     "3.1.7",
     "3.2.3",
+    "3.3.2",
 ]
 
 LIBRESSL_OLD_VERSIONS = [