Closes #17962: Build with OpenSSL 1.0.1e on Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index c266b1ea0922758aebed12f1aacd4e1861454fea..c81aeb489c734c80a1d9b69973de0d1aff13b4fe 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -250,6 +250,8 @@ Build
 - Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
   4.8.
 
+- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
+
 
 What's New in Python 3.3.1?
 ===========================

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index e204d2fea76ee5b747181ac9400bef373ea54bb5..f978f8503a5c61f596dd1a570e68c51aacef7703 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.1d
+        dist/openssl-1.0.1e
 
-    You need to use version 1.0.1d of OpenSSL.
+    You need to use version 1.0.1e 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 43555a6adcc22b158a26f38e4d13e44eacd2d158..131bd3fabcf4638593e10e1f1c511e3910238b01 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.1d"\r
+               Value="$(externalsDir)\openssl-1.0.1e"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 18581ba2cee62949edc6e7dc95aa2ab7dac00cc8..ff3759e4595df68687cfd6c6b8b3bc19c0358153 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.1d"\r
+               Value="$(externalsDir)\openssl-1.0.1e"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 2333512f7f629c44373d8f413cc6114177cefb69..815523188f576f71deeb574ce8d43ffc133413e6 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.1d</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1e</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 08aa0f71b9824817d2aecfb4ba1cd3d3db33d632..2efe2494654bd1bdc54631e718d3c8f3faecb2e5 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.1d
+    svn export http://svn.python.org/projects/external/openssl-1.0.1e
 
     ** 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 ef6115765ef0a89f599dd31c89243316dce73d5c..c6278b2673f5ac0d8c96b2a3e469d0d3d8358d29 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.1d rd /s/q openssl-1.0.1d
+@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
 @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.1d (
-    rd /s/q openssl-1.0.1c
-    svn export http://svn.python.org/projects/external/openssl-1.0.1d
+if not exist openssl-1.0.1e (
+    rd /s/q openssl-1.0.1d
+    svn export http://svn.python.org/projects/external/openssl-1.0.1e
 )
 
 @rem tcl/tk