diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-04-14 00:30:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-14 00:30:34 (GMT) |
| commit | b1dc07509f78b354e83f5f4a902f1ff80c7bb05d (patch) | |
| tree | 5d0f0a6a2c729c4cf40fdc5ad65702b2b16f34b4 | |
| parent | 23ab5ee667a9b29014f6f7f01797c611f63ff743 (diff) | |
| download | cpython-b1dc07509f78b354e83f5f4a902f1ff80c7bb05d.zip cpython-b1dc07509f78b354e83f5f4a902f1ff80c7bb05d.tar.gz cpython-b1dc07509f78b354e83f5f4a902f1ff80c7bb05d.tar.bz2 | |
bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 4 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst new file mode 100644 index 0000000..ca47a98 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst @@ -0,0 +1 @@ +Update Windows installer to use OpenSSL 1.1.0h. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 6d30751..f4bde04 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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 diff --git a/PCbuild/python.props b/PCbuild/python.props index f943313..f7adaf4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -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> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 6af38fb..c847328 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -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. |