diff options
| author | Steve Dower <steve.dower@python.org> | 2021-04-06 15:03:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 15:03:52 (GMT) |
| commit | 611aa39142f156508945ac312724474c493a6691 (patch) | |
| tree | ad6389a5416a2d064fad0c2466821a273989f41a /PCbuild | |
| parent | 8a34a0793bcb830350dac675524310bb285e5e4f (diff) | |
| download | cpython-611aa39142f156508945ac312724474c493a6691.zip cpython-611aa39142f156508945ac312724474c493a6691.tar.gz cpython-611aa39142f156508945ac312724474c493a6691.tar.bz2 | |
bpo-43745: Actually updates Windows release to OpenSSL 1.1.1k. (GH-25213)
Earlier releases were mislabelled and included 1.1.1i again.
The tag/directory name is updated to ensure that builds get the fresh bits. However, the openssl-bin-1.1.1k tag in the repository has been forcibly updated, so fresh builds will be fine even without this change.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 203290f..bf3208d 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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.1k +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k-1 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 5822ba1..e056482 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -63,7 +63,7 @@ <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir> <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir> <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k\$(ArchName)\</opensslOutDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |