diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-04-14 00:31:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-14 00:31:16 (GMT) |
| commit | 1672c2fbae6128ee4717e08c4e65a0ab99a02a02 (patch) | |
| tree | 4d768b470ccf365ea0600220694bd9b565259d04 | |
| parent | e98e3385f2acfc6d98f70f8e66c96b752d003b8f (diff) | |
| download | cpython-1672c2fbae6128ee4717e08c4e65a0ab99a02a02.zip cpython-1672c2fbae6128ee4717e08c4e65a0ab99a02a02.tar.gz cpython-1672c2fbae6128ee4717e08c4e65a0ab99a02a02.tar.bz2 | |
bpo-33184: Update Windows installer to OpenSSL 1.0.2o (GH-6464)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-04-13-11-39-28.bpo-33184.aEohx0.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Windows/2018-04-13-11-39-28.bpo-33184.aEohx0.rst b/Misc/NEWS.d/next/Windows/2018-04-13-11-39-28.bpo-33184.aEohx0.rst new file mode 100644 index 0000000..e754155 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-04-13-11-39-28.bpo-33184.aEohx0.rst @@ -0,0 +1 @@ +Update Windows installer to OpenSSL 1.0.2o. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7c1ed27..cea2068 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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 diff --git a/PCbuild/python.props b/PCbuild/python.props index 6589a23..8c398a1 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -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> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 6f9b9a2..04a3867 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -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/ |