[Python-checkins] cpython (merge 3.5 -> default): Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.

[steve.dower]

https://hg.python.org/cpython/rev/91c5097bca2b
changeset:   96785:91c5097bca2b
parent:      96782:e5082ddfbb60
parent:      96784:ebc8559b2e57
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Jul 03 15:17:17 2015 -0700
summary:
  Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.

files:
  Misc/NEWS                 |  5 +++++
  PCbuild/get_externals.bat |  2 +-
  PCbuild/python.props      |  2 +-
  PCbuild/readme.txt        |  2 +-
  4 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,11 @@
 - 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
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@
 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
--- 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
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -197,7 +197,7 @@
     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/

-- 
Repository URL: https://hg.python.org/cpython