Issue #26930: Update Windows build to OpenSSL 1.0.2h

diff --git a/Misc/NEWS b/Misc/NEWS
index 0b3439fb84034096d269464cd2431c7b85a5a038..cdf606b8e201db42921ec55213780b56683096ec 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,11 @@ Documentation
   resulting links to use lowercase.  Patch by Sean Rodman, test by Kaushik
   Nadikuditi.
 
+Build
+-----
+
+- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+
 
 What's New in Python 2.7.12 release candidate 1?
 ================================================

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 8fa5d70993222c2146779ccb2a68cd5f968423e4..49012515533a5cfbfacd65b4bb03f542e59410b3 100644 (file)
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.2g"\r
+               Value="$(externalsDir)\openssl-1.0.2h"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 42b1536f4264e248cdce0c666492f87b2a540c0a..3345af964d937414ec2c0b55c660a714403fced9 100644 (file)
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@ _ssl
 \r
     Get the source code through\r
 \r
-    svn export http://svn.python.org/projects/external/openssl-1.0.2g\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2h\r
 \r
     ** NOTE: if you use the PCbuild\get_externals.bat approach for\r
     obtaining external sources then you don't need to manually get the source\r

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 9a40992e048e7eeeb9944839a6c43f8217be4086..90b1068ca1e264bbc101d959558e9978d64cb6bc 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6\r
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0\r
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2g\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h\r
 set libraries=%libraries%                                    sqlite-3.8.11.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index abfb8264d0b55cc542b1e09be740b47f8219ccc7..e40751aad0a9125d3226f23921999e59a36472be 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <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 8f9e80534f8d3ae4b711f1bd5552b98eac8fb43e..7fee48f50543b6eb5c05f03cf98ca732dd18c9c9 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@ _bz2
     Homepage:\r
         http://www.bzip.org/\r
 _ssl\r
-    Python wrapper for version 1.0.2g of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2h of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r