diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-16 14:40:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 14:40:19 (GMT) |
| commit | 26729ce74a47c3d16f219aee0a712011622aeeb5 (patch) | |
| tree | 5d6394f1614c446db8b609e4634f833383e291d3 /PCbuild | |
| parent | 0067fc287a86cdd8d71dc2d402d596950ff88fca (diff) | |
| download | cpython-26729ce74a47c3d16f219aee0a712011622aeeb5.zip cpython-26729ce74a47c3d16f219aee0a712011622aeeb5.tar.gz cpython-26729ce74a47c3d16f219aee0a712011622aeeb5.tar.bz2 | |
bpo-38117: Update bundled Windows OpenSSL to 1.1.1d (GH-16184)
(cherry picked from commit 3ab73f6bbf4ff66e7ace3c4eab25461b5c7d71d4)
Co-authored-by: Steve Dower <steve.dower@python.org>
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 04c71ac..100149e 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-3.3.0-rc0-r1 -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1d set libraries=%libraries% sqlite-3.28.0.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.1c +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1d 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 ba68ce3..8583138 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.1c\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1c\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.1d\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1d\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |