From 56db2229f41937c3d925281ee63dc359170f41ac Mon Sep 17 00:00:00 2001
From: Zachary Ware <zach@python.org>
Date: Wed, 4 Sep 2024 10:13:23 -0500
Subject: [PATCH 1/3] gh-123418: Update CI to use fresh OpenSSL releases

---
 .github/workflows/build.yml                                 | 2 +-
 .github/workflows/reusable-ubuntu.yml                       | 2 +-
 .../2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst          | 2 ++
 Tools/ssl/multissltests.py                                  | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f3995a020e31b..c08263e652237a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -202,7 +202,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
+        openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index 92069fddc31217..b197db814b2743 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       FORCE_COLOR: 1
-      OPENSSL_VER: 3.0.13
+      OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux
     steps:
diff --git a/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst b/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
new file mode 100644
index 00000000000000..fb9ac9e4f96725
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
@@ -0,0 +1,2 @@
+Update GitHub CI workflows to use OpenSSL 3.0.15 and multissltests to use
+3.0.15, 3.1.7, and 3.2.3.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index baa16102068aa0..8443d036ffbc5b 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -47,9 +47,9 @@
 
 OPENSSL_RECENT_VERSIONS = [
     "1.1.1w",
-    "3.0.13",
-    "3.1.5",
-    "3.2.1",
+    "3.0.15",
+    "3.1.7",
+    "3.2.3",
 ]
 
 LIBRESSL_OLD_VERSIONS = [

From f3035fb1823668a0d7bf6950f68048a58fc26dc0 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zach@python.org>
Date: Wed, 4 Sep 2024 10:26:19 -0500
Subject: [PATCH 2/3] Add openssl/openssl GitHub URL template for OpenSSL
 downloads

---
 Tools/ssl/multissltests.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 8443d036ffbc5b..7baf9c29d408c8 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -397,6 +397,7 @@ def run_python_tests(self, tests, network=True):
 class BuildOpenSSL(AbstractBuilder):
     library = "OpenSSL"
     url_templates = (
+        "https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
         "https://www.openssl.org/source/openssl-{v}.tar.gz",
         "https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
     )
@@ -439,6 +440,7 @@ def short_version(self):
             parsed = parsed[:2]
         return ".".join(str(i) for i in parsed)
 
+
 class BuildLibreSSL(AbstractBuilder):
     library = "LibreSSL"
     url_templates = (

From 32bdb432681cc1a4aff11ba0bd1c5cd4d3c81847 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zach@python.org>
Date: Wed, 4 Sep 2024 11:46:45 -0500
Subject: [PATCH 3/3] fixup! gh-123418: Update CI to use fresh OpenSSL releases

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c08263e652237a..efd3162731f77d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -266,7 +266,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
     env:
-      OPENSSL_VER: 3.0.13
+      OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@v4
@@ -380,7 +380,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 3.0.13
+      OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps: