Issue #17425: Build with openssl 1.0.0k on Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index e4d04b189c9d962f39f32e1f141d23bcecc31dbb..dbc12e7a3a64681a1caddf95016c2861c1610a07 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1084,6 +1084,8 @@ Tests
 Build
 -----
 
+- Issue #17425: Build with openssl 1.0.0k 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 fa1ae7db1803290763d12d5352bacaf74d0c6311..d93760d22b53da96f4b19d63e92246a4f33f3510 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.0k
 
-    You need to use version 1.0.0j of OpenSSL.
+    You need to use version 1.0.0k 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 2a82e4962cb3db6ba624d270100f21cec35c8a65..b75b2c6f20ea1f6f486df1288aeb6684de60d413 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.0k"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 6a94a6835b35ceeca702e0a37c3964bd429c016a..d5ce7d0bf3d11e116535c16ab68d58c2e673d316 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -58,7 +58,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.0j"\r
+               Value="$(externalsDir)\openssl-1.0.0k"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index c7e3c725ba6234a831b72b02a593599f140dd04f..f8b7dd2ac0fb7a2bd149b1550a00bf628e12cd42 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,7 +139,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.0k
 
     ** 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 2165b8a1f05dca4204aa59afd92d4639990d3d25..f031c1cc68b35b29c60ece1e274234e10495e8fe 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.0k rd /s/q openssl-1.0.0k
 @rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4    
 
 @rem bzip
@@ -24,7 +24,7 @@ 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.0k svn export http://svn.python.org/projects/external/openssl-1.0.0k
 
 @rem tcl/tk
 if not exist tcl-8.5.9.0 (