diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-12-10 20:26:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 20:26:33 -0800 |
| commit | 3c8bd22b8f0d7f57261b9d3c90e56447cd5acf94 (patch) | |
| tree | 33b554d2eb311cb5d9952f60d6534b740cf68ff5 | |
| parent | 2632df4c3f48f23af85a60bffc61030d52e83ee2 (diff) | |
| download | cpython-git-3c8bd22b8f0d7f57261b9d3c90e56447cd5acf94.tar.gz | |
bpo-35401: Updates Windows build to OpenSSL 1.0.2q (GH-11089)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/libeay.vcxproj | 3 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst b/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst new file mode 100644 index 0000000000..a804473fd6 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst @@ -0,0 +1 @@ +Updates Windows build to OpenSSL 1.0.2q diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 8bc19e678c..bda243fe2e 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0 set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2p +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2q set libraries=%libraries% sqlite-3.14.2.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0 diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj index 68ef936db8..b0994e12f0 100644 --- a/PCbuild/libeay.vcxproj +++ b/PCbuild/libeay.vcxproj @@ -533,6 +533,7 @@ <!-- <ClCompile Include="$(opensslDir)crypto\fips_ers.c" /> --> + <ClCompile Include="$(opensslDir)crypto\getenv.c" /> <ClCompile Include="$(opensslDir)crypto\hmac\hm_ameth.c" /> <ClCompile Include="$(opensslDir)crypto\hmac\hm_pmeth.c" /> <ClCompile Include="$(opensslDir)crypto\hmac\hmac.c" /> @@ -725,9 +726,7 @@ <ClCompile Include="$(opensslDir)crypto\ui\ui_lib.c" /> <ClCompile Include="$(opensslDir)crypto\ui\ui_openssl.c" /> <ClCompile Include="$(opensslDir)crypto\ui\ui_util.c" /> - <!-- <ClCompile Include="$(opensslDir)crypto\uid.c" /> - --> <ClCompile Include="$(opensslDir)crypto\whrlpool\wp_dgst.c" /> <ClCompile Include="$(opensslDir)crypto\x509\by_dir.c" /> <ClCompile Include="$(opensslDir)crypto\x509\by_file.c" /> diff --git a/PCbuild/python.props b/PCbuild/python.props index cebb86f147..6673ff3136 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2p\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2q\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> |