summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-01-10 00:51:49 (GMT)
committerGitHub <noreply@github.com>2023-01-10 00:51:49 (GMT)
commit13453a205bb40b23dc1ef4901714135a54fdd0d3 (patch)
treed331d7de6c414bcc2231fa42d4bce706e059dd44 /PCbuild
parent4e096ec647a3500b72aae30de3ce6cef3b96b606 (diff)
downloadcpython-13453a205bb40b23dc1ef4901714135a54fdd0d3.zip
cpython-13453a205bb40b23dc1ef4901714135a54fdd0d3.tar.gz
cpython-13453a205bb40b23dc1ef4901714135a54fdd0d3.tar.bz2
gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100901)
(cherry picked from commit d7ab7149f83e4f194cf0e3a438fb6ca177832c99) Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/get_externals.bat4
-rw-r--r--PCbuild/python.props4
2 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 98cca97..7efdeb2 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 320d41f..971c149 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>