mirror of
https://github.com/python/cpython.git
synced 2024-11-23 09:54:58 +08:00
bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834)
This commit is contained in:
parent
08b1bbab6b
commit
80d827c3cb
@ -61,7 +61,7 @@ jobs:
|
||||
variables:
|
||||
testRunTitle: '$(build.sourceBranchName)-linux'
|
||||
testRunPlatform: linux
|
||||
openssl_version: 1.1.1f
|
||||
openssl_version: 1.1.1g
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
@ -118,7 +118,7 @@ jobs:
|
||||
variables:
|
||||
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
|
||||
testRunPlatform: linux-coverage
|
||||
openssl_version: 1.1.1f
|
||||
openssl_version: 1.1.1g
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
@ -61,7 +61,7 @@ jobs:
|
||||
variables:
|
||||
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
|
||||
testRunPlatform: linux
|
||||
openssl_version: 1.1.1f
|
||||
openssl_version: 1.1.1g
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
@ -118,7 +118,7 @@ jobs:
|
||||
variables:
|
||||
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
|
||||
testRunPlatform: linux-coverage
|
||||
openssl_version: 1.1.1f
|
||||
openssl_version: 1.1.1g
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
@ -0,0 +1 @@
|
||||
Updates Windows OpenSSL to 1.1.1g
|
@ -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.1f
|
||||
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g
|
||||
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.1f
|
||||
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g
|
||||
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
|
||||
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
|
||||
|
||||
|
@ -62,8 +62,8 @@
|
||||
<libffiDir>$(ExternalsDir)libffi\</libffiDir>
|
||||
<libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
|
||||
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.1.1f\</opensslDir>
|
||||
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1f\$(ArchName)\</opensslOutDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.1.1g\</opensslDir>
|
||||
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1g\$(ArchName)\</opensslOutDir>
|
||||
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
|
||||
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>
|
||||
|
Loading…
Reference in New Issue
Block a user