bpo-41837: Updated Windows installer to include OpenSSL 1.1.1i (GH-24… · zooba/cpython@ba2fd5e · GitHub

1. zooba
2. cpython

Repository navigation

• Code
• Pull requests1 (1)
• Projects
• Security and quality
• Insights

Commit ba2fd5e

Browse filesBrowse the repository at this point in the historyBrowse files

zooba

committed

bpo-41837: Updated Windows installer to include OpenSSL 1.1.1i (pythonGH-24125)

1 parent f27451d commit ba2fd5e
Copy full SHA for ba2fd5e

4 files changed

+10-4Lines changed: 10 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc/NEWS.d/next/Windows
  • 2021-01-05-20-36-40.bpo-41837.bmS7vB.rst
• PCbuild
  • get_externals.bat
  • python.props
  • readme.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS.d/next/Windows/2021-01-05-20-36-40.bpo-41837.bmS7vB.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Updated Windows installer to include OpenSSL 1.1.1i

Collapse file

‎PCbuild/get_externals.bat‎

Copy file name to clipboardExpand all lines: PCbuild/get_externals.bat

+6-1Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
53	53	set libraries=
54	54	set libraries=%libraries% bzip2-1.0.6
55	55	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
57	57	set libraries=%libraries% sqlite-3.33.0.0
58	58	if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
59	59	if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,8 +77,13 @@ echo.Fetching external binaries...
77	77
78	78	set binaries=
79	79	if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi
	80	+ <<<<<<< HEAD
80	81	if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g
81	82	if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
	83	+ =======
	84	+ if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1i
	85	+ if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.10.0
	86	+ >>>>>>> afb7144378... bpo-41837: Updated Windows installer to include OpenSSL 1.1.1i (GH-24125)
82	87	if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
83	88
84	89	for %%b in (%binaries%) do (

Collapse file

‎PCbuild/python.props‎

Copy file name to clipboardExpand all lines: PCbuild/python.props

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -62,8 +62,8 @@
62	62	<libffiDir>$(ExternalsDir)libffi\</libffiDir>
63	63	<libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
64	64	<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>
67	67	<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
68	68	<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
69	69	<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

Collapse file

‎PCbuild/readme.txt‎

Copy file name to clipboardExpand all lines: PCbuild/readme.txt

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -165,7 +165,7 @@ _lzma
165	165	Homepage:
166	166	http://tukaani.org/xz/
167	167	_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
169	169	library, which is downloaded from our binaries repository at
170	170	https://github.com/python/cpython-bin-deps.
171	171

0 commit comments

Comments

0 (0)