Issue #24603: Update Windows build to use OpenSSL 1.0.2d

diff --git a/Misc/NEWS b/Misc/NEWS
index 29312ab039d490171cb9320698722e8e546f73fc..8c15bed27d8aee4db5022431bf9eb1456c9b4132 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,8 +107,8 @@ Build
   backported files replace the old project files in PCbuild; the old files moved
   to PC/VS9.0 and remain supported.
 
-- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
-  1.0.2c.
+- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL
+  1.0.2d.
 
 IDLE
 ----

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index a52e06319e73e78861aef91353d252e8d4ed4f23..5625f9d028fbf41f175e4d1a8234cbb7833cb8ac 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.2c"\r
+               Value="$(externalsDir)\openssl-1.0.2d"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 74820fb6052e04f03d1bd312d63fc1d61d853789..8f543a5da1cf12bb760bae55416b4edc0307d9f7 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.2c\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2d\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 59403eff7c43f9b500745948540f122d3991c726..a2aea9d0dfedea3f828709f6a1f6146430ee975d 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ for %%e in (
             bzip2-1.0.6\r
             db-4.7.25.0\r
             nasm-2.11.06\r
-            openssl-1.0.2c\r
+            openssl-1.0.2d\r
             tcl-8.5.15.0\r
             tk-8.5.15.0\r
             tix-8.4.3.5\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 5727c595a9cb3168a8325dd3abbd9fa2e20816f3..f7965c33571e1d2a59d9b740969594a81e35dc21 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -30,7 +30,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.2c\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2d\</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
index e5bf746042c01c8ef1f0cb0aba7d81875519cbb1..a2f08c94674ade563ee1e440578debb72942ade4 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -146,7 +146,7 @@ _ssl
 \r
     Get the source code through\r
 \r
-    svn export http://svn.python.org/projects/external/openssl-1.0.2c\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2d\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