summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-03 22:16:37 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-03 22:16:37 (GMT)
commitf92673c25419d85e96b2aac084682bc109b68635 (patch)
treea828214248e72581277abe1797fe49fdfe6fcb47
parentac2bd5b1e8c5d8ee04c12ef6f34f1c9f1f8338c0 (diff)
parenta09ef0389badf6646e1d470d722880e6d5d65f33 (diff)
downloadcpython-f92673c25419d85e96b2aac084682bc109b68635.zip
cpython-f92673c25419d85e96b2aac084682bc109b68635.tar.gz
cpython-f92673c25419d85e96b2aac084682bc109b68635.tar.bz2
Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
-rw-r--r--Misc/NEWS5
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/python.props2
-rw-r--r--PCbuild/readme.txt2
4 files changed, 8 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f440b18..3d9671c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,6 +100,11 @@ Documentation
- Issue #24351: Clarify what is meant by "identifier" in the context of
string.Template instances.
+Build
+-----
+
+- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
+
What's New in Python 3.5.0 beta 2?
==================================
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 926bd5f..7817691 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-core-8.6.4.1
tk-8.6.4.1
tix-8.4.3.4
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 37740fe..1431ddc 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -34,7 +34,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>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<!-- Suffix for all binaries when building for debug -->
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 26622f5..256cb7b 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -197,7 +197,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.1j 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/