Issue #28248: Update Windows build to use OpenSSL 1.0.2j

diff --git a/Misc/NEWS b/Misc/NEWS
index d8771466dfd94ff877f5c9dcad79a5c359a88e67..c68e5f294456d26d619969a9579af8c2167a9b09 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,8 @@ Tests
 Build
 -----
 
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 - Issue #28258: Fixed build with Estonian locale (distclean target in
   Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.
 

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 49012515533a5cfbfacd65b4bb03f542e59410b3..13d9b1c08be63f22a73492f2068da9b6d2ca2963 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.2h"\r
+               Value="$(externalsDir)\openssl-1.0.2j"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 3345af964d937414ec2c0b55c660a714403fced9..21de0c025d6aed16a1233c833018e675b17721d8 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.2h\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2j\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 90b1068ca1e264bbc101d959558e9978d64cb6bc..387d9aed9c9bf30fbba6541ef2616215b9b50c9c 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6\r
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0\r
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j\r
 set libraries=%libraries%                                    sqlite-3.8.11.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index e40751aad0a9125d3226f23921999e59a36472be..21ea5fa2a8d01f735520f90da4ff61110261539a 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 7fee48f50543b6eb5c05f03cf98ca732dd18c9c9..67adb7f0a024963d0c49e12014a3a1073c7f5bdf 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@ _bz2
     Homepage:\r
         http://www.bzip.org/\r
 _ssl\r
-    Python wrapper for version 1.0.2h of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2j of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r