From: Ned Deily <nad@python.org>
Date: Tue, 6 Feb 2024 04:02:10 +0000 (-0500)
Subject: [3.11] gh-109991: Update GitHub CI workflows to use OpenSSL 3.0.13. (GH-115057)
X-Git-Tag: v3.11.8~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=319e69579eaa73b1c106dacb44cb2148e9aa9e21;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-109991: Update GitHub CI workflows to use OpenSSL 3.0.13. (GH-115057)

Also update multissltests to use 1.1.1w, 3.0.13, 3.1.5, and 3.2.1.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 080eeeedb450..6143248a8b39 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -232,7 +232,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1w, 3.0.11, 3.1.3]
+        openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -286,7 +286,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 3.0.11
+      OPENSSL_VER: 3.0.13
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index db4ca4d46673..de413b83b9e2 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-20.04
     env:
-      OPENSSL_VER: 3.0.11
+      OPENSSL_VER: 3.0.13
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@v4
diff --git a/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst b/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst
new file mode 100644
index 000000000000..4eb4d39629b9
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst
@@ -0,0 +1,2 @@
+Update GitHub CI workflows to use OpenSSL 3.0.13 and multissltests to use
+1.1.1w, 3.0.13, 3.1.5, and 3.2.1.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 7b9983fe0520..99ecc45a637d 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -48,8 +48,9 @@ OPENSSL_OLD_VERSIONS = [
 
 OPENSSL_RECENT_VERSIONS = [
     "1.1.1w",
-    "3.0.11",
-    "3.1.3",
+    "3.0.13",
+    "3.1.5",
+    "3.2.1",
 ]
 
 LIBRESSL_OLD_VERSIONS = [