8000 [3.9] bpo-43631: Update to OpenSSL 1.1.1k (GH-25024) (GH-25088) · python/cpython@cd82d59 · GitHub
[go: up one dir, main page]
Skip to content

Commit cd82d59

Browse files
tirantiran
authored
[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 a54fc68) Co-authored-by: Christian Heimes <christian@python.org>
1 parent f79577d commit cd82d59

File tree

11 files changed

+18
-17
lines changed

11 files changed

+18
-17
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1g
60+
openssl_version: 1.1.1k
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1g
86+
openssl_version: 1.1.1k
8787

8888
steps:
8989
- template: ./posix-steps.yml

‎.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1g
60+
openssl_version: 1.1.1k
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1g
86+
openssl_version: 1.1.1k
8787

8888
steps:
8989
- template: ./posix-steps.yml

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
needs: check_source
126126
if: needs.check_source.outputs.run_tests == 'true'
127127
env:
128-
OPENSSL_VER: 1.1.1f
128+
OPENSSL_VER: 1.1.1k
129129
steps:
130130
- uses: actions/checkout@v2
131131
- name: Install Dependencies

‎.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
< 8000 /div>
2525
name: 'Ubuntu (Coverage)'
2626
runs-on: ubuntu-latest
2727
env:
28-
OPENSSL_VER: 1.1.1f
28+
OPENSSL_VER: 1.1.1k
2929
steps:
3030
- uses: actions/checkout@v2
3131
- name: Install Dependencies

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cache:
1010

1111
env:
1212
global:
13-
- OPENSSL=1.1.1f
13+
- OPENSSL=1.1.1k
1414
- OPENSSL_DIR="$HOME/multissl/openssl/${OPENSSL}"
1515
- PATH="${OPENSSL_DIR}/bin:$PATH"
1616
- CFLAGS="-I${OPENSSL_DIR}/include"

‎Mac/BuildScript/build-installer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ def library_recipes():
242242

243243
result.extend([
244244
dict(
245-
name="OpenSSL 1.1.1j",
246-
url="https://www.openssl.org/source/openssl-1.1.1j.tar.gz",
247-
checksum='cccaa064ed860a2b4d1303811bf5c682',
245+
name="OpenSSL 1.1.1k",
246+
url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
247+
checksum='c4e7d95f782b08116afa27b30393dd27',
248248
buildrecipe=build_universal_openssl,
249249
configure=None,
250250
install=None,

‎Misc/NEWS.d/next/Build/2021-03-26-09-16-34.bpo-43631.msJyPi.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update macOS, Windows, and CI to OpenSSL 1.1.1k.

‎PCbuild/get_externals.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.6
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1i
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1k
5757
set libraries=%libraries% sqlite-3.34.0.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
7777

7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi
80-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1i
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

‎PCbuild/python.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<libffiDir>$(ExternalsDir)libffi\</libffiDir>
6363
<libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
6464
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
65-
<opensslDir>$(ExternalsDir)openssl-1.1.1i\</opensslDir>
66-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1i\$(ArchName)\</opensslOutDir>
65+
<opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
66+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k\$(ArchName)\</opensslOutDir>
6767
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
6868
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
6969
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

‎PCbuild/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ _lzma
166166
Homepage:
167167
http://tukaani.org/xz/
168168
_ssl
169-
Python wrapper for version 1.1.1i of the OpenSSL secure sockets
169+
Python wrapper for version 1.1.1k of the OpenSSL secure sockets
170170
library, which is downloaded from our binaries repository at
171171
https://github.com/python/cpython-bin-deps.
172172

‎Tools/ssl/multissltests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
]
4949

5050
OPENSSL_RECENT_VERSIONS = [
51-
"1.1.1g",
52-
# "3.0.0-alpha2"
51+
"1.1.1k",
52+
# "3.0.0-alpha12"
5353
]
5454

5555
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)
0