diff options
| author | Steve Dower <steve.dower@python.org> | 2020-04-04 14:19:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 14:19:08 (GMT) |
| commit | a1d4dbdfc78e3aed4c245e1810ef24eaa4e744c2 (patch) | |
| tree | efde5d539a4d0c5adff08fd4f1d474bb9a925634 /PCbuild | |
| parent | 52013e5b6d5ca32eef5a3d65ecdf7db89cefc2fd (diff) | |
| download | cpython-a1d4dbdfc78e3aed4c245e1810ef24eaa4e744c2.zip cpython-a1d4dbdfc78e3aed4c245e1810ef24eaa4e744c2.tar.gz cpython-a1d4dbdfc78e3aed4c245e1810ef24eaa4e744c2.tar.bz2 | |
bpo-40164: Update Windows to OpenSSL 1.1.1f (GH-19359)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 4 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index a079b75..fa27cdf 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -53,7 +53,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1d +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1f set libraries=%libraries% sqlite-3.31.1.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0 @@ -77,7 +77,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi -if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1d +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1f if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index 4cba669..d1d16d6 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -62,8 +62,8 @@ <libffiDir>$(ExternalsDir)libffi\</libffiDir> <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir> <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir> - <opensslDir>$(ExternalsDir)openssl-1.1.1d\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1d\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.1f\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1f\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |