From f4118e9995f858f6f2f09c48c841cb45b176d3c5 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Wed, 17 Jan 2024 08:46:46 -0500
Subject: [PATCH] [3.9] gh-109991: Update GitHub CI workflows to use OpenSSL
 3.0.11 and multissltests to use 1.1.1w and 3.0.11. (GH-110008)

(cherry picked from commit c88037d137a98d7c399c7bd74d5117b5bcae1543)
---
 .github/workflows/build.yml                                   | 4 ++--
 .../2023-09-27-23-31-54.gh-issue-109991.sUUYY8.rst            | 2 ++
 Tools/ssl/multissltests.py                                    | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tools-Demos/2023-09-27-23-31-54.gh-issue-109991.sUUYY8.rst

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa27c48acb9..d26ebc8e6bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -182,7 +182,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1v
+      OPENSSL_VER: 3.0.11
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@v4
@@ -224,7 +224,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1v, 3.0.10, 3.1.2]
+        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1w, 3.0.11, 3.1.3]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Tools-Demos/2023-09-27-23-31-54.gh-issue-109991.sUUYY8.rst b/Misc/NEWS.d/next/Tools-Demos/2023-09-27-23-31-54.gh-issue-109991.sUUYY8.rst
new file mode 100644
index 00000000000..eb69e36df9e
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2023-09-27-23-31-54.gh-issue-109991.sUUYY8.rst
@@ -0,0 +1,2 @@
+Update GitHub CI workflows to use OpenSSL 3.0.11 and multissltests to use
+1.1.1w and 3.0.11.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 921f0f5cd5f..1a20e3f19a1 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -49,8 +49,8 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1v",
-    "3.0.10",
+    "1.1.1w",
+    "3.0.11",
 ]
 
 LIBRESSL_OLD_VERSIONS = [