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

diff --git a/Misc/NEWS b/Misc/NEWS
index e88938ca538e8c3e4182f8a7cb4b2e89a7361847..28674b8a0c2fabccf3067748b892d7f4df4cdf11 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -294,6 +294,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 f6ed0700221f191ec88d5d460449afe39a325130..63ba282d8baaf8e5be93805a5ae20a2400f7271e 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
 set libraries=\r
 set libraries=%libraries%                                    bzip2-1.0.6\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.8.11.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2\r

diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat
index c08a9f3474f3e30fe67ecffa8093cabb03f7c085..1be73e6c365c677035eff6f526656592faa8f45f 100644 (file)
--- a/PCbuild/prepare_ssl.bat
+++ b/PCbuild/prepare_ssl.bat
@@ -1,6 +1,6 @@
 @echo off\r
 if not defined HOST_PYTHON (\r
-  if %1 EQU Debug (\r
+  if "%1" EQU "Debug" (\r
     shift\r
     set HOST_PYTHON=python_d.exe\r
     if not exist python35_d.dll exit 1\r
@@ -9,4 +9,4 @@ if not defined HOST_PYTHON (
     if not exist python35.dll exit 1\r
   )\r
 )\r
-%HOST_PYTHON% prepare_ssl.py %1\r
+%HOST_PYTHON% "%~dp0prepare_ssl.py" %1\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 8ad9a894891099ca03ec49cbb0854b16a9c5248f..07acfaba7b2b75b94ddc63ae70b328779f46d677 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -41,7 +41,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
-    <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>