Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.

diff --git a/Misc/NEWS b/Misc/NEWS
index 2afab1cb9ba211b48213b557097c48f16a8f7d62..8798998b3dd39b2746a977ba19b2d0f14982395f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,8 @@ Tests
 Build
 -----
 
+- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
+
 - Issue #24421: Compile Modules/_math.c once, before building extensions.
   Previously it could fail to compile properly if the math and cmath builds
   were concurrent.

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 333ee8250c0a9404f5f66a2322e6cf9da6f5ecf1..2c940fa16ff270fef4c3ceb2aa2bcc374d144107 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.2f\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2g\r
 set libraries=%libraries%                                    sqlite-3.6.21\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 d51e58baa81173da982b5f6fcf1f147392bf6496..23dfb561a61212f5c4c7daa9834cab0f565f0479 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2g\</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 c15c3643ba2024d178225b93d07f5e71479b21cc..9b21bea84f934ecfb3a94a25ae8ad6920442e39a 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.2f of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2g of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r