Issue #24603: Merge with 3.5

Misc/NEWS

@@ -67,6 +67,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?
 ==================================
 

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

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 -->

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/