[Python-checkins] gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100901)
miss-islington
webhook-mailer at python.org
Mon Jan 9 19:52:11 EST 2023
https://github.com/python/cpython/commit/13453a205bb40b23dc1ef4901714135a54fdd0d3
commit: 13453a205bb40b23dc1ef4901714135a54fdd0d3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2023-01-09T16:51:49-08:00
summary:
gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100901)
(cherry picked from commit d7ab7149f83e4f194cf0e3a438fb6ca177832c99)
Co-authored-by: Steve Dower <steve.dower at python.org>
files:
A Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst
M PCbuild/get_externals.bat
M PCbuild/python.props
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 000000000000..5b0f42568d92
--- /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 98cca979fdfc..7efdeb2d30a7 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 320d41f4cc20..971c1490d9f1 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>
More information about the Python-checkins
mailing list