Issue #17425: Build with openssl 1.0.1d on Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index 00faf3476616cae3c186dc65aebb61e0abf6190f..2c496dd22ed3afbad2398fe8bbda048a79073bc0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -811,6 +811,8 @@ Tests
 Build
 -----
 
+- Issue #17425: Build with openssl 1.0.1d on Windows.
+
 - Issue #16754: Fix the incorrect shared library extension on linux. Introduce
   two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
   SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index d6ec6e6408f65cdbea2133fdb41c6144910c2aff..e204d2fea76ee5b747181ac9400bef373ea54bb5 100644 (file)
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,9 +153,9 @@ _ssl
 
     Unpack into the "dist" directory, retaining the folder name from
     the archive - for example, the latest stable OpenSSL will install as
-        dist/openssl-1.0.1c
+        dist/openssl-1.0.1d
 
-    You need to use version 1.0.1c of OpenSSL.
+    You need to use version 1.0.1d of OpenSSL.
 
     You can install the NASM assembler from
         http://www.nasm.us/

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index f86cdec832c901710d3e839e425d5b0a36620324..43555a6adcc22b158a26f38e4d13e44eacd2d158 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.1c"\r
+               Value="$(externalsDir)\openssl-1.0.1d"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 01c7ca7b3aa9b187d7914646633c566177676e86..06c6c787d9a6c0e6fd1299cc54727ed2389c8516 100644 (file)
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -62,7 +62,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.1c"\r
+               Value="$(externalsDir)\openssl-1.0.1r"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 4afbe3cd008fc83fe6174175bb90d4295e035078..2333512f7f629c44373d8f413cc6114177cefb69 100644 (file)
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,7 @@
     <sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
-    <opensslDir>$(externalsDir)\openssl-1.0.1c</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
     <tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index e74942965673b7b758288de631975f41c47c8de6..08aa0f71b9824817d2aecfb4ba1cd3d3db33d632 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1c
+    svn export http://svn.python.org/projects/external/openssl-1.0.1d
 
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 4e9fe4187b0ac432bb04614f4cbead1f8f7403d4..ef6115765ef0a89f599dd31c89243316dce73d5c 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@ cd ..
 @rem if exist tk8.4.16 rd /s/q tk8.4.16
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
+@rem if exist openssl-1.0.1d rd /s/q openssl-1.0.1d
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
 
 @rem bzip
@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
 )
 
 @rem OpenSSL
-if not exist openssl-1.0.1c (
-    rd /s/q openssl-1.0.0j
-    svn export http://svn.python.org/projects/external/openssl-1.0.1c
+if not exist openssl-1.0.1d (
+    rd /s/q openssl-1.0.1c
+    svn export http://svn.python.org/projects/external/openssl-1.0.1d
 )
 
 @rem tcl/tk