diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-09-12 01:02:40 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-09-12 01:02:40 (GMT) |
| commit | e351fe241c1fcb8cd739b08e21d2bb2f2b4c8c89 (patch) | |
| tree | 24e8c97d6840a56526d7e0a90ed695164d1c3350 | |
| parent | aa02ab15aed9d0b70f619c186326594c0d50bdd6 (diff) | |
| download | cpython-e351fe241c1fcb8cd739b08e21d2bb2f2b4c8c89.zip cpython-e351fe241c1fcb8cd739b08e21d2bb2f2b4c8c89.tar.gz cpython-e351fe241c1fcb8cd739b08e21d2bb2f2b4c8c89.tar.bz2 | |
[2.7] bpo-34405: Updated to OpenSSL 1.0.2p for Windows builds. (GH-8776) (GH-9202)
https://bugs.python.org/issue34405
| -rw-r--r-- | Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst b/Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst new file mode 100644 index 0000000..b79eddb --- /dev/null +++ b/Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst @@ -0,0 +1 @@ +Updated to OpenSSL 1.0.2p for Windows builds.
\ No newline at end of file diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 6edae2e..8bc19e6 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.2o +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2p 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 d2b1991..cebb86f 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.2o\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2p\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> |