changeset:   104450:cc5006dab787
branch:      3.6
parent:      104445:cd5f20f75857
parent:      104449:5fa74d8c987b
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Mon Oct 10 22:22:27 2016 -0500
files:       Misc/NEWS PCbuild/get_externals.bat PCbuild/pyproject.props PCbuild/python.props PCbuild/readme.txt
description:
Issue #28248: Merge with 3.5


diff -r cd5f20f75857 -r cc5006dab787 Misc/NEWS
--- a/Misc/NEWS	Mon Oct 10 20:53:33 2016 -0400
+++ b/Misc/NEWS	Mon Oct 10 22:22:27 2016 -0500
@@ -13,6 +13,11 @@
 Library
 -------
 
+Build
+-----
+
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 
 What's New in Python 3.6.0 beta 2
 =================================
diff -r cd5f20f75857 -r cc5006dab787 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Mon Oct 10 20:53:33 2016 -0400
+++ b/PCbuild/get_externals.bat	Mon Oct 10 22:22:27 2016 -0500
@@ -54,7 +54,7 @@
 set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j
 set libraries=%libraries%                                    sqlite-3.14.1.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
diff -r cd5f20f75857 -r cc5006dab787 PCbuild/python.props
--- a/PCbuild/python.props	Mon Oct 10 20:53:33 2016 -0400
+++ b/PCbuild/python.props	Mon Oct 10 22:22:27 2016 -0500
@@ -45,7 +45,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
diff -r cd5f20f75857 -r cc5006dab787 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Mon Oct 10 20:53:33 2016 -0400
+++ b/PCbuild/readme.txt	Mon Oct 10 22:22:27 2016 -0500
@@ -169,7 +169,7 @@
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.2h of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2j of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/