diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-17 16:33:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 16:33:11 (GMT) |
| commit | d8e3a8af775d683c606f3618d04f2be4e97ac3c0 (patch) | |
| tree | 7cf0d5b4d4fc58436a2572c6b4e4e95c8e94de38 | |
| parent | 722733e940199ce8957254236e2aa7c453044fde (diff) | |
| download | cpython-d8e3a8af775d683c606f3618d04f2be4e97ac3c0.zip cpython-d8e3a8af775d683c606f3618d04f2be4e97ac3c0.tar.gz cpython-d8e3a8af775d683c606f3618d04f2be4e97ac3c0.tar.bz2 | |
bpo-34631: Updated OpenSSL to 1.0.2s in Windows installer (GH-14161)
| -rw-r--r-- | Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.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/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst b/Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst new file mode 100644 index 0000000..41a972e --- /dev/null +++ b/Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst @@ -0,0 +1 @@ +Updated OpenSSL to 1.0.2s in Windows installer diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index ed6a79f..f0a4b99 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.2q +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2s 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 6673ff3..b3dc1da 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.2q\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2s\</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 556a8f2..ab4b6d0 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.2o of the OpenSSL secure sockets + Python wrapper for version 1.0.2s of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/ |