Browse Source
bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)
pull/6314/merge
Steve Dower
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
6 additions and
5 deletions
-
Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst
-
PCbuild/get_externals.bat
-
PCbuild/python.props
-
PCbuild/readme.txt
|
|
|
@ -0,0 +1 @@ |
|
|
|
Update Windows installer to use OpenSSL 1.1.0h. |
|
|
|
@ -49,7 +49,7 @@ echo.Fetching external libraries... |
|
|
|
|
|
|
|
set libraries= |
|
|
|
set libraries=%libraries% bzip2-1.0.6 |
|
|
|
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f |
|
|
|
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0h |
|
|
|
set libraries=%libraries% sqlite-3.21.0.0 |
|
|
|
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0 |
|
|
|
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0 |
|
|
|
@ -72,7 +72,7 @@ for %%e in (%libraries%) do ( |
|
|
|
echo.Fetching external binaries... |
|
|
|
|
|
|
|
set binaries= |
|
|
|
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0f |
|
|
|
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0h |
|
|
|
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0 |
|
|
|
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 |
|
|
|
|
|
|
|
|
|
|
|
@ -49,8 +49,8 @@ |
|
|
|
<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.1.0f\</opensslDir> |
|
|
|
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0f\$(ArchName)\</opensslOutDir> |
|
|
|
<opensslDir>$(ExternalsDir)openssl-1.1.0h\</opensslDir> |
|
|
|
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0h\$(ArchName)\</opensslOutDir> |
|
|
|
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> |
|
|
|
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> |
|
|
|
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |
|
|
|
|
|
|
|
@ -165,7 +165,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.1.0h of the OpenSSL secure sockets |
|
|
|
library, which is downloaded from our binaries repository at |
|
|
|
https://github.com/python/cpython-bin-deps. |
|
|
|
|
|
|
|
|
