mirror of
https://github.com/python/cpython.git
synced 2025-10-04 14:15:45 +00:00
[3.9] bpo-43631: Update to OpenSSL 1.1.1k (GH-25024) (GH-25088)
Signed-off-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc683f2)
Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes
GitHub
parent
f79577ddbd
commit
cd82d59206
11 changed files with 18 additions and 17 deletions
|
|
@ -57,7 +57,7 @@ jobs:
|
|||
variables:
|
||||
testRunTitle: '$(build.sourceBranchName)-linux'
|
||||
testRunPlatform: linux
|
||||
openssl_version: 1.1.1g
|
||||
openssl_version: 1.1.1k
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
|
@ -83,7 +83,7 @@ jobs:
|
|||
variables:
|
||||
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
|
||||
testRunPlatform: linux-coverage
|
||||
openssl_version: 1.1.1g
|
||||
openssl_version: 1.1.1k
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ jobs:
|
|||
variables:
|
||||
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
|
||||
testRunPlatform: linux
|
||||
openssl_version: 1.1.1g
|
||||
openssl_version: 1.1.1k
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
|
@ -83,7 +83,7 @@ jobs:
|
|||
variables:
|
||||
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
|
||||
testRunPlatform: linux-coverage
|
||||
openssl_version: 1.1.1g
|
||||
openssl_version: 1.1.1k
|
||||
|
||||
steps:
|
||||
- template: ./posix-steps.yml
|
||||
|
|
|
|||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -125,7 +125,7 @@ jobs:
|
|||
needs: check_source
|
||||
if: needs.check_source.outputs.run_tests == 'true'
|
||||
env:
|
||||
OPENSSL_VER: 1.1.1f
|
||||
OPENSSL_VER: 1.1.1k
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Dependencies
|
||||
|
|
|
|||
2
.github/workflows/coverage.yml
vendored
2
.github/workflows/coverage.yml
vendored
|
|
@ -25,7 +25,7 @@ jobs:
|
|||
name: 'Ubuntu (Coverage)'
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
OPENSSL_VER: 1.1.1f
|
||||
OPENSSL_VER: 1.1.1k
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Dependencies
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ cache:
|
|||
|
||||
env:
|
||||
global:
|
||||
- OPENSSL=1.1.1f
|
||||
- OPENSSL=1.1.1k
|
||||
- OPENSSL_DIR="$HOME/multissl/openssl/${OPENSSL}"
|
||||
- PATH="${OPENSSL_DIR}/bin:$PATH"
|
||||
- CFLAGS="-I${OPENSSL_DIR}/include"
|
||||
|
|
|
|||
|
|
@ -242,9 +242,9 @@ def library_recipes():
|
|||
|
||||
result.extend([
|
||||
dict(
|
||||
name="OpenSSL 1.1.1j",
|
||||
url="https://www.openssl.org/source/openssl-1.1.1j.tar.gz",
|
||||
checksum='cccaa064ed860a2b4d1303811bf5c682',
|
||||
name="OpenSSL 1.1.1k",
|
||||
url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
|
||||
checksum='c4e7d95f782b08116afa27b30393dd27',
|
||||
buildrecipe=build_universal_openssl,
|
||||
configure=None,
|
||||
install=None,
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Update macOS, Windows, and CI to OpenSSL 1.1.1k.
|
||||
|
|
@ -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.1i
|
||||
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1k
|
||||
set libraries=%libraries% sqlite-3.34.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.1i
|
||||
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k
|
||||
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.1i\</opensslDir>
|
||||
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1i\$(ArchName)\</opensslOutDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
|
||||
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k\$(ArchName)\</opensslOutDir>
|
||||
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
|
||||
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ _lzma
|
|||
Homepage:
|
||||
http://tukaani.org/xz/
|
||||
_ssl
|
||||
Python wrapper for version 1.1.1i of the OpenSSL secure sockets
|
||||
Python wrapper for version 1.1.1k of the OpenSSL secure sockets
|
||||
library, which is downloaded from our binaries repository at
|
||||
https://github.com/python/cpython-bin-deps.
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ OPENSSL_OLD_VERSIONS = [
|
|||
]
|
||||
|
||||
OPENSSL_RECENT_VERSIONS = [
|
||||
"1.1.1g",
|
||||
# "3.0.0-alpha2"
|
||||
"1.1.1k",
|
||||
# "3.0.0-alpha12"
|
||||
]
|
||||
|
||||
LIBRESSL_OLD_VERSIONS = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue