Skip to content

Commit 947f411

Browse files
committed
Issue python#26465: Update Windows builds to use OpenSSL 1.0.2g.
1 parent cc2dbc5 commit 947f411

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,8 @@ Tests
294294
Build
295295
-----
296296

297+
- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
298+
297299
- Issue #24421: Compile Modules/_math.c once, before building extensions.
298300
Previously it could fail to compile properly if the math and cmath builds
299301
were concurrent.

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
5454
set libraries=
5555
set libraries=%libraries% bzip2-1.0.6
5656
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
57-
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
57+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
5858
set libraries=%libraries% sqlite-3.8.11.0
5959
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
6060
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2

‎PCbuild/prepare_ssl.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
if not defined HOST_PYTHON (
3-
if %1 EQU Debug (
3+
if "%1" EQU "Debug" (
44
shift
55
set HOST_PYTHON=python_d.exe
66
if not exist python35_d.dll exit 1
@@ -9,4 +9,4 @@ if not defined HOST_PYTHON (
99
if not exist python35.dll exit 1
1010
)
1111
)
12-
%HOST_PYTHON% prepare_ssl.py %1
12+
%HOST_PYTHON% "%~dp0prepare_ssl.py" %1

‎PCbuild/python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
4242
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
4343
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
44-
<opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
44+
<opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
4545
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
4646
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
4747
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

0 commit comments

Comments
 (0)