diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-08-15 13:29:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 13:29:24 -0700 |
| commit | 864a892af38afefb0a0464af298cf09d2e1195f7 (patch) | |
| tree | 7d9e3d5937aaafe6b9935555b8ad09acf5ec3bd4 | |
| parent | e0b5b2096ead4cc094a129ce7602ac5c0e998086 (diff) | |
| download | cpython-git-864a892af38afefb0a0464af298cf09d2e1195f7.tar.gz | |
bpo-34405: Updated to OpenSSL 1.1.0i for Windows builds. (GH-8775)
| -rw-r--r-- | Misc/NEWS.d/next/Security/2018-08-15-12-12-47.bpo-34405.qbHTH_.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 4 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Security/2018-08-15-12-12-47.bpo-34405.qbHTH_.rst b/Misc/NEWS.d/next/Security/2018-08-15-12-12-47.bpo-34405.qbHTH_.rst new file mode 100644 index 0000000000..a3a006fd48 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2018-08-15-12-12-47.bpo-34405.qbHTH_.rst @@ -0,0 +1 @@ +Updated to OpenSSL 1.1.0i for Windows builds. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index f4bde044cf..9d4faee5f7 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -49,7 +49,7 @@ echo.Fetching external libraries... set libraries= 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 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 @@ -72,7 +72,7 @@ for %%e in (%libraries%) do ( echo.Fetching external 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 "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index fc0b6618ca..09f11d3bba 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -49,8 +49,8 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> - <opensslDir>$(ExternalsDir)openssl-1.1.0h\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0h\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.0i\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0i\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |