Skip to content

Commit 86b1207

Browse files
authored
bpo-41837: Updated Windows installer to include OpenSSL 1.1.1i (GH-24125)
1 parent f27451d commit 86b1207

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated Windows installer to include OpenSSL 1.1.1i

PCbuild/get_externals.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.6
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0-rc0-r1
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1i
5757
set libraries=%libraries% sqlite-3.33.0.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
7777

7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi
80-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1i
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

PCbuild/python.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<libffiDir>$(ExternalsDir)libffi\</libffiDir>
6363
<libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
6464
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
65-
<opensslDir>$(ExternalsDir)openssl-1.1.1g\</opensslDir>
66-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1g\$(ArchName)\</opensslOutDir>
65+
<opensslDir>$(ExternalsDir)openssl-1.1.1i\</opensslDir>
66+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1i\$(ArchName)\</opensslOutDir>
6767
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
6868
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
6969
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

PCbuild/readme.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ _lzma
165165
Homepage:
166166
http://tukaani.org/xz/
167167
_ssl
168-
Python wrapper for version 1.1.1c of the OpenSSL secure sockets
168+
Python wrapper for version 1.1.1i of the OpenSSL secure sockets
169169
library, which is downloaded from our binaries repository at
170170
https://github.com/python/cpython-bin-deps.
171171

0 commit comments

Comments
 (0)