summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-03 22:13:48 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-03 22:13:48 (GMT)
commita09ef0389badf6646e1d470d722880e6d5d65f33 (patch)
tree37c926983f399613ed10e2b2576f3f06e8a902bc
parent09e60588389710232030a39b1ae9ba99542ba602 (diff)
downloadcpython-a09ef0389badf6646e1d470d722880e6d5d65f33.zip
cpython-a09ef0389badf6646e1d470d722880e6d5d65f33.tar.gz
cpython-a09ef0389badf6646e1d470d722880e6d5d65f33.tar.bz2
Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
-rw-r--r--Misc/NEWS2
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/pyproject.props2
-rw-r--r--PCbuild/readme.txt2
4 files changed, 5 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index becb9ef..95a1237 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -343,6 +343,8 @@ Build
- Issue #23686: Update OS X 10.5 installer and Windows builds to use
OpenSSL 1.0.2a.
+- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
+
C API
-----
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 3836ee4..8ece4e3 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
for %%e in (
bzip2-1.0.6
nasm-2.11.06
- openssl-1.0.2a
+ openssl-1.0.2c
tcl-8.6.1.0
tk-8.6.1.0
tix-8.4.3.4
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 7e6c7dd..26fd569 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
- <opensslDir>$(externalsDir)\openssl-1.0.2a</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.2c</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index c27af99..5b3e980 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -171,7 +171,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.2a of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2c of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/