mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #26930: Update Windows build to OpenSSL 1.0.2h

Browse source
This commit is contained in:
Zachary Ware 2016-06-15 17:13:28 -05:00
parent dccc5edfa1
commit f88d83b922
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS
View file

@ -36,6 +36,7 @@ Library
locale encoding, and fix get_begidx() and get_endidx() to return code point locale encoding, and fix get_begidx() and get_endidx() to return code point
indexes. indexes.
- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
What's New in Python 3.5.2 final? What's New in Python 3.5.2 final?
================================= =================================

2
PCbuild/get_externals.bat
View file

@ -54,7 +54,7 @@ echo.Fetching external libraries...
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
set libraries=%libraries% sqlite-3.8.11.0 set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2

2
PCbuild/python.props
View file

@ -41,7 +41,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

2
PCbuild/readme.txt
View file

@ -169,7 +169,7 @@ _lzma
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _ssl
Python wrapper for version 1.0.2g of the OpenSSL secure sockets Python wrapper for version 1.0.2h of the OpenSSL secure sockets
library, which is built by ssl.vcxproj library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/