Issue #28248: Update Windows build to use OpenSSL 1.0.2j · python/cpython@8fb09ad · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 8fb09ad

Browse filesBrowse the repository at this point in the historyBrowse files

zware

committed

Issue #28248: Update Windows build to use OpenSSL 1.0.2j

1 parent 829d4fb commit 8fb09ad
Copy full SHA for 8fb09ad

6 files changed

+7-5Lines changed: 7 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc
  • NEWS
• PCbuild
  • get_externals.bat
  • python.props
  • readme.txt
• PC/VS9.0
  • pyproject.vsprops
  • readme.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS‎

Copy file name to clipboardExpand all lines: Misc/NEWS

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -230,6 +230,8 @@ Tests
230	230	Build
231	231	-----
232	232
	233	+ - Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
	234	+
233	235	- Issue #28258: Fixed build with Estonian locale (distclean target in
234	236	Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.
235	237

Collapse file

‎PC/VS9.0/pyproject.vsprops‎

Copy file name to clipboardExpand all lines: PC/VS9.0/pyproject.vsprops

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

Original file line number	Diff line number	Diff line change
@@ -82,7 +82,7 @@
82	82	/>
83	83	<UserMacro
84	84	Name="opensslDir"
85		- Value="$(externalsDir)\openssl-1.0.2h"
	85	+ Value="$(externalsDir)\openssl-1.0.2j"
86	86	/>
87	87	<UserMacro
88	88	Name="tcltkDir"

Collapse file

‎PC/VS9.0/readme.txt‎

Copy file name to clipboardExpand all lines: PC/VS9.0/readme.txt

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

Original file line number	Diff line number	Diff line change
@@ -132,7 +132,7 @@ _ssl
132	132
133	133	Get the source code through
134	134
135		- svn export http://svn.python.org/projects/external/openssl-1.0.2h
	135	+ svn export http://svn.python.org/projects/external/openssl-1.0.2j
136	136
137	137	** NOTE: if you use the PCbuild\get_externals.bat approach for
138	138	obtaining external sources then you don't need to manually get the source

Collapse file

‎PCbuild/get_externals.bat‎

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

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

Original file line number	Diff line number	Diff line change
@@ -58,7 +58,7 @@ set libraries=
58	58	set libraries=%libraries% bzip2-1.0.6
59	59	if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
60	60	if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
61		- if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
	61	+ if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
62	62	set libraries=%libraries% sqlite-3.8.11.0
63	63	if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
64	64	if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0

Collapse file

‎PCbuild/python.props‎

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

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

Original file line number	Diff line number	Diff line change
@@ -35,7 +35,7 @@
35	35	<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
36	36	<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
37	37	<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
38		- <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
	38	+ <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
39	39	<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
40	40	<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
41	41	<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

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
@@ -183,7 +183,7 @@ _bz2
183	183	Homepage:
184	184	http://www.bzip.org/
185	185	_ssl
186		- Python wrapper for version 1.0.2h of the OpenSSL secure sockets
	186	+ Python wrapper for version 1.0.2j of the OpenSSL secure sockets
187	187	library, which is built by ssl.vcxproj
188	188	Homepage:
189	189	http://www.openssl.org/

0 commit comments

Comments

0 (0)