diff options
| author | Steve Dower <steve.dower@python.org> | 2018-04-14 21:50:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2018-04-14 22:04:21 (GMT) |
| commit | bba2ba180de91177a73d28551dce71696d472c47 (patch) | |
| tree | c4a230f7ab953a97ecc88827ea702c0a3282913a | |
| parent | 01a0fd4a3a4cb9928518518acc9c9f2ed6e9a382 (diff) | |
| download | cpython-bba2ba180de91177a73d28551dce71696d472c47.zip cpython-bba2ba180de91177a73d28551dce71696d472c47.tar.gz cpython-bba2ba180de91177a73d28551dce71696d472c47.tar.bz2 | |
bpo-33148: Update Windows build to use OpenSSL 1.0.2o
closes https://github.com/python/cpython/pull/6474
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-04-14-14-50-01.bpo-33184.to0tIj.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-14-14-50-01.bpo-33184.to0tIj.rst b/Misc/NEWS.d/next/Windows/2018-04-14-14-50-01.bpo-33184.to0tIj.rst new file mode 100644 index 0000000..7ec8faf --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-04-14-14-50-01.bpo-33184.to0tIj.rst @@ -0,0 +1 @@ +Update Windows build to use OpenSSL 1.0.2o. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 39041f5..6edae2e 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0 set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0 -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.14.2.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0 diff --git a/PCbuild/python.props b/PCbuild/python.props index e0b0d82..d2b1991 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir> - <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 2f10635..556a8f2 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -192,7 +192,7 @@ _bz2 Homepage: http://www.bzip.org/ _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/ |