Commit 947f411b authored by Steve Dower's avatar Steve Dower

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

parent cc2dbc58
...@@ -294,6 +294,8 @@ Tests ...@@ -294,6 +294,8 @@ Tests
Build Build
----- -----
- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
- Issue #24421: Compile Modules/_math.c once, before building extensions. - Issue #24421: Compile Modules/_math.c once, before building extensions.
Previously it could fail to compile properly if the math and cmath builds Previously it could fail to compile properly if the math and cmath builds
were concurrent. were concurrent.
......
...@@ -54,7 +54,7 @@ echo.Fetching external libraries... ...@@ -54,7 +54,7 @@ echo.Fetching external libraries...
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
set libraries=%libraries% sqlite-3.8.11.0 set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
......
@echo off @echo off
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if "%1" EQU "Debug" (
shift shift
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python35_d.dll exit 1 if not exist python35_d.dll exit 1
...@@ -9,4 +9,4 @@ if not defined HOST_PYTHON ( ...@@ -9,4 +9,4 @@ if not defined HOST_PYTHON (
if not exist python35.dll exit 1 if not exist python35.dll exit 1
) )
) )
%HOST_PYTHON% prepare_ssl.py %1 %HOST_PYTHON% "%~dp0prepare_ssl.py" %1
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> <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>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment