Upgrade OpenSSL to 1.0.1c

diff --git a/Misc/NEWS b/Misc/NEWS
index c83d3d36abe49114b6dacb4cafe5e7130f7c7e32..3e1195665b74e246d84c784d58d3972009f7d48e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -135,6 +135,8 @@ Tools/Demos
 Build
 -----
 
+- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c.
+
 - Issue #14693: Under non-Windows platforms, hashlib's fallback modules are
   always compiled, even if OpenSSL is present at build time.
 

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index b6fa5d2fdac222f23d6e9ca03eb7f69fc110d224..d6ec6e6408f65cdbea2133fdb41c6144910c2aff 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.0j
+        dist/openssl-1.0.1c
 
-    You need to use version 1.0.0j of OpenSSL.
+    You need to use version 1.0.1c 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 c31182029f4e8be042265eb7592d620c296d6eac..f86cdec832c901710d3e839e425d5b0a36620324 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.0j"\r
+               Value="$(externalsDir)\openssl-1.0.1c"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index fa3dad74685856143b2d10db0d1994c7c2666bbe..01c7ca7b3aa9b187d7914646633c566177676e86 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.0j"\r
+               Value="$(externalsDir)\openssl-1.0.1c"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 522ac88fa747d6576c81e0f641afb0b0e3113d72..f466a0700f3c69732ceb0e1c722840145319222a 100644 (file)
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -7,7 +7,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.0j</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1c</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 a45ed1706e38057ee6c2d5bf649e187fe36a2774..fe22929bf574d23903cfebafb3e59c1440bca281 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -148,7 +148,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.0j
+    svn export http://svn.python.org/projects/external/openssl-1.0.1c
 
     ** 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 39c316ad82f7ff43657318164c003befa4e14bbe..9757c20953445c81b54d1f2bf31e41da8df57aa4 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.0j rd /s/q openssl-1.0.0j
+@rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
 
 @rem bzip
@@ -24,7 +24,10 @@ if not exist bzip2-1.0.6 (
 )
 
 @rem OpenSSL
-if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
+if not exist openssl-1.0.0c (
+    rd /s/q openssl-1.0.0j
+    svn export http://svn.python.org/projects/external/openssl-1.0.0c
+)
 
 @rem tcl/tk
 if not exist tcl-8.5.11.0 (