From 19b422dd702bde07ef0899d311658b861e76479d Mon Sep 17 00:00:00 2001
From: Zachary Ware <zach@python.org>
Date: Tue, 25 Aug 2026 17:51:59 -0500
Subject: [PATCH] [3.14] gh-156369: Update CI to use latest SSL library
 versions (GH-156381) (cherry picked from commit
 369f04a1bcc26ddd05e2910d32d7008132b81a3c)

Co-authored-by: Zachary Ware <zach@python.org>
---
 .github/workflows/build.yml           | 12 ++++++------
 .github/workflows/reusable-san.yml    |  2 +-
 .github/workflows/reusable-ubuntu.yml |  2 +-
 Tools/ssl/multissltests.py            |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c5de0d578d9bdd..dd60f73d294543 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -319,10 +319,10 @@ jobs:
           # unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
           # supported by important vendors such as AWS-LC.
           - { name: openssl, version: 1.1.1w }
-          - { name: openssl, version: 3.0.21 }
-          - { name: openssl, version: 3.4.6 }
-          - { name: openssl, version: 3.5.7 }
-          - { name: openssl, version: 3.6.3 }
+          - { name: openssl, version: 3.0.22 }
+          - { name: openssl, version: 3.4.7 }
+          - { name: openssl, version: 3.5.8 }
+          - { name: openssl, version: 3.6.4 }
     env:
       SSLLIB_VER: ${{ matrix.ssllib.version }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -427,7 +427,7 @@ jobs:
     needs: build-context
     if: needs.build-context.outputs.run-ubuntu == 'true'
     env:
-      OPENSSL_VER: 3.5.7
+      OPENSSL_VER: 3.5.8
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -535,7 +535,7 @@ jobs:
       matrix:
         os: [ubuntu-26.04]
     env:
-      OPENSSL_VER: 3.5.7
+      OPENSSL_VER: 3.5.8
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:
diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml
index 8a9c7d86462f4f..79cc95ce5796f2 100644
--- a/.github/workflows/reusable-san.yml
+++ b/.github/workflows/reusable-san.yml
@@ -17,7 +17,7 @@ permissions:
 
 env:
   FORCE_COLOR: 1
-  OPENSSL_VER: 3.5.7
+  OPENSSL_VER: 3.5.8
 
 jobs:
   build-san-reusable:
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index 28a176275cc467..ba606b48b6c5dc 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     timeout-minutes: 60
     env:
-      OPENSSL_VER: 3.5.7
+      OPENSSL_VER: 3.5.8
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux
     steps:
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index cb349236a034c4..9f0ff343740f3c 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -50,10 +50,10 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "3.0.21",
-    "3.4.6",
-    "3.5.7",
-    "3.6.3",
+    "3.0.22",
+    "3.4.7",
+    "3.5.8",
+    "3.6.4",
     # See make_ssl_data.py for notes on adding a new version.
 ]