changeset:   102190:e1e5691d02d8
branch:      3.5
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Wed Jun 15 17:13:28 2016 -0500
files:       Misc/NEWS PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt
description:
Issue #26930: Update Windows build to OpenSSL 1.0.2h


diff -r 4d04aca4afb0 -r e1e5691d02d8 Misc/NEWS
--- a/Misc/NEWS	Sun Jun 12 23:40:00 2016 -0700
+++ b/Misc/NEWS	Wed Jun 15 17:13:28 2016 -0500
@@ -10,8 +10,17 @@
 Core and Builtins
 -----------------
 
-Library
--------
+- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+
+Tests
+-----
+
+- Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
+
+IDLE
+----
+
+- Issue #27365: Allow non-ascii in idlelib/NEWS.txt - minimal part for 3.5.2.
 
 
 What's New in Python 3.5.2 release candidate 1?
diff -r 4d04aca4afb0 -r e1e5691d02d8 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Sun Jun 12 23:40:00 2016 -0700
+++ b/PCbuild/get_externals.bat	Wed Jun 15 17:13:28 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.2g
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h
 set libraries=%libraries%                                    sqlite-3.8.11.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
diff -r 4d04aca4afb0 -r e1e5691d02d8 PCbuild/python.props
--- a/PCbuild/python.props	Sun Jun 12 23:40:00 2016 -0700
+++ b/PCbuild/python.props	Wed Jun 15 17:13:28 2016 -0500
@@ -41,7 +41,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
diff -r 4d04aca4afb0 -r e1e5691d02d8 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Sun Jun 12 23:40:00 2016 -0700
+++ b/PCbuild/readme.txt	Wed Jun 15 17:13:28 2016 -0500
@@ -169,7 +169,7 @@
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.2g of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2h of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/