From 892e7c3065efb77ffb5ec502f0dbd99983061823 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Mon, 9 Jan 2023 23:04:09 +0000
Subject: [PATCH] gh-100180: Update Windows installer to OpenSSL 1.1.1s

---
 .../Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst    | 1 +
 PCbuild/get_externals.bat                                     | 4 ++--
 PCbuild/python.props                                          | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst

diff --git a/Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst b/Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst
new file mode 100644
index 00000000000000..5b0f42568d92fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst
@@ -0,0 +1 @@
+Update Windows installer to OpenSSL 1.1.1s
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 98cca979fdfcd0..7efdeb2d30a72c 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.8
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.4.3
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1q
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1s
 set libraries=%libraries%                                       sqlite-3.39.4.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.4.3
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1q
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1s
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 320d41f4cc20d8..971c1490d9f120 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -67,8 +67,8 @@
     <libffiDir>$(ExternalsDir)libffi-3.4.3\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.4.3\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1q\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1q\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1s\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.13\</zlibDir>