diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-17 15:26:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 15:26:43 -0700 |
| commit | 14bac0088271d0a5c428e3468ef94fe7c73e93f7 (patch) | |
| tree | ea2da94f6c5ca86393c925a1657e455a5e140a34 | |
| parent | 336cf399546f3362033f9d2b475feae050373ef8 (diff) | |
| download | cpython-git-14bac0088271d0a5c428e3468ef94fe7c73e93f7.tar.gz | |
bpo-34631: Updated OpenSSL to 1.1.1c in Windows installer (GH-14163)
| -rw-r--r-- | Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.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/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst b/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst new file mode 100644 index 0000000000..90aa30192f --- /dev/null +++ b/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst @@ -0,0 +1 @@ +Updated OpenSSL to 1.1.1c in Windows installer diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 27722bb9c4..3f70653b2e 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.1b +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c set libraries=%libraries% sqlite-3.21.0.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.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.1b +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1c if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index 58877ee066..2dd01fda8f 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.1b\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1b\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.1c\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1c\$(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 c44722b988..8f759361fd 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.1.1b of the OpenSSL secure sockets + Python wrapper for version 1.1.1c of the OpenSSL secure sockets library, which is downloaded from our binaries repository at https://github.com/python/cpython-bin-deps. |