traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-33184: Update Windows installer to OpenSSL 1.0.2o (GH-6464)

This commit is contained in:
Steve Dower 2018-04-13 17:31:16 -07:00 committed by GitHub
parent e98e3385f2
commit 1672c2fbae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2018-04-13-11-39-28.bpo-33184.aEohx0.rst Normal file
View File

@ -0,0 +1 @@
Update Windows installer to OpenSSL 1.0.2o.

2
PCbuild/get_externals.bat
View File

@ -41,7 +41,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2o
set libraries=%libraries% sqlite-3.21.0.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0

2
PCbuild/python.props
View File

@ -49,7 +49,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2o\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

2
PCbuild/readme.txt
View File

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