Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-34405: Updated to OpenSSL 1.1.0i for Windows builds. (GH-8775)

This commit is contained in:
Steve Dower 2018-08-15 13:29:24 -07:00 committed by GitHub
parent e0b5b2096e
commit 864a892af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Security/2018-08-15-12-12-47.bpo-34405.qbHTH_.rst Normal file
View File

@ -0,0 +1 @@
Updated to OpenSSL 1.1.0i for Windows builds.

4
PCbuild/get_externals.bat
View File

@ -49,7 +49,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 "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0h if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0i
set libraries=%libraries% sqlite-3.21.0.0 set libraries=%libraries% sqlite-3.21.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0
@ -72,7 +72,7 @@ for %%e in (%libraries%) do (
echo.Fetching external binaries... echo.Fetching external binaries...
set binaries= set binaries=
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0h if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0i
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06

4
PCbuild/python.props
View File

@ -49,8 +49,8 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.1.0h\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.1.0i\</opensslDir>
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0h\$(ArchName)\</opensslOutDir> <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0i\$(ArchName)\</opensslOutDir>
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>