From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 15 Jun 2016 22:13:28 +0000 (-0500)
Subject: Issue #26930: Update Windows build to OpenSSL 1.0.2h
X-Git-Tag: v3.6.0a3~135^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f88d83b922d3525ec65dbfe03e27f197ef1a9021;p=thirdparty%2FPython%2Fcpython.git

Issue #26930: Update Windows build to OpenSSL 1.0.2h
---

diff --git a/Misc/NEWS b/Misc/NEWS
index d81a37401551..fe847b466fb1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,7 @@ Library
   locale encoding, and fix get_begidx() and get_endidx() to return code point
   indexes.
 
+- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
 
 What's New in Python 3.5.2 final?
 =================================
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 63ba282d8baa..9b2a084bc2f8 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
 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 --git a/PCbuild/python.props b/PCbuild/python.props
index 07acfaba7b2b..843771d3f009 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -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 --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index e68cc5c859b4..d45eb271f820 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -169,7 +169,7 @@ _lzma
     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/