From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 8 Mar 2016 18:26:39 +0000 (-0800)
Subject: Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3fbbf4b3525e06b0804f6e7a6bab54e33384b50;p=python

Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 2afab1cb9b..8798998b3d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,8 @@ Tests
 Build
 -----
 
+- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
+
 - Issue #24421: Compile Modules/_math.c once, before building extensions.
   Previously it could fail to compile properly if the math and cmath builds
   were concurrent.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 333ee8250c..2c940fa16f 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2f
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2g
 set libraries=%libraries%                                    sqlite-3.6.21
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
diff --git a/PCbuild/python.props b/PCbuild/python.props
index d51e58baa8..23dfb561a6 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2g\</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 c15c3643ba..9b21bea84f 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@ _bz2
     Homepage:
         http://www.bzip.org/
 _ssl
-    Python wrapper for version 1.0.2f of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2g of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/