diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-17 19:54:19 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@python.org> | 2019-06-17 19:54:18 (GMT) |
| commit | c28c1358245b9fe42e9559c34eae01befce73a1f (patch) | |
| tree | 4cb32e2e7dd473a4373b8327ea6fd069b6cd0065 /PCbuild | |
| parent | 79d8204c4f02d02b3c6570de94c85863c27ddecb (diff) | |
| download | cpython-c28c1358245b9fe42e9559c34eae01befce73a1f.zip cpython-c28c1358245b9fe42e9559c34eae01befce73a1f.tar.gz cpython-c28c1358245b9fe42e9559c34eae01befce73a1f.tar.bz2 | |
bpo-34631: Updated OpenSSL to 1.1.1c in Windows installer (GH-14163)
(cherry picked from commit a268edd6a411480281222b1fdb0f78053434d17f)
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 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 42ffe6f..1640769 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.1b +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c set libraries=%libraries% sqlite-3.21.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.1b +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1c 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 b13837d..0f93a00 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.1b\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1b\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.1c\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1c\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index cf4aa4c..3348156 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -165,7 +165,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.1.1b of the OpenSSL secure sockets + Python wrapper for version 1.1.1c of the OpenSSL secure sockets library, which is downloaded from our binaries repository at https://github.com/python/cpython-bin-deps. |