summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-07-22 04:27:08 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-07-22 04:27:08 (GMT)
commit80acc3ebbc4c81f9c1bff864eca076d6bdbe9ec6 (patch)
tree2a6d789c9abe4b88d40e0c630522dfef4c46662f
parentd7841ef48b48a361d22cc1795eff5d826eef20fa (diff)
parent689b55c1cb837c0b89be46b57e52912fe4b2072d (diff)
downloadcpython-80acc3ebbc4c81f9c1bff864eca076d6bdbe9ec6.zip
cpython-80acc3ebbc4c81f9c1bff864eca076d6bdbe9ec6.tar.gz
cpython-80acc3ebbc4c81f9c1bff864eca076d6bdbe9ec6.tar.bz2
Issue #24603: Update the Windows build to use OpenSSL 1.0.2d
-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 279cf5c..f69138e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,11 @@ Library
- Issue #24669: Fix inspect.getsource() for 'async def' functions.
Patch by Kai Groner.
+Build
+-----
+
+- Issue #24603: Update the Windows build to use OpenSSL 1.0.2d.
+
What's New in Python 3.5.0 beta 3?
==================================
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 7817691..95b0879 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.2c
+ openssl-1.0.2d
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 857b8f8..22faf44 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.2c\</opensslDir>
+ <opensslDir>$(ExternalsDir)openssl-1.0.2d\</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 256cb7b..b045ed1 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.2c of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2d of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/