Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d737623

Browse filesBrowse files
zwarezooba
andauthored
[3.8] gh-109991: Update Windows build to use OpenSSL 1.1.1w (GH-111266)
(cherry picked from commit dcb16c9) Co-authored-by: Steve Dower <steve.dower@python.org>
1 parent 02a9259 commit d737623
Copy full SHA for d737623

File tree

Expand file treeCollapse file tree

3 files changed

+8
-4
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+8
-4
lines changed
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Windows builds now use OpenSSL 1.1.1w. Note that OpenSSL 1.1 has reached its
2+
end of life and no future fixes will be made, and this version of Python is
3+
no longer receiving maintenance fixes and will not be updated to OpenSSL
4+
3.0.

‎PCbuild/get_externals.bat

Copy file name to clipboardExpand all lines: PCbuild/get_externals.bat
+2-2Lines changed: 2 additions & 2 deletions
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.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1u
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1w
5757
set libraries=%libraries% sqlite-3.35.5.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-3.3.0
80-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1u
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1w
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

Copy file name to clipboardExpand all lines: PCbuild/python.props
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
6868
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
6969
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
70-
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
71-
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
70+
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1w\</opensslDir>
71+
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1w\$(ArchName)\</opensslOutDir>
7272
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
7373
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
7474
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.12\</zlibDir>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.