FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) · python/cpython@af0a50d · GitHub

/ cpython Public

Commit af0a50d

Browse files
tiran
and
zware
authored
bpo-47024: Update OpenSSL to 1.1.1n (GH-31895)
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
1 parent 099f756 commit af0a50d

8 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎.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.1m
60+
openssl_version: 1.1.1n
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.1m
86+
openssl_version: 1.1.1n
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.1m
60+
openssl_version: 1.1.1n
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.1m
86+
openssl_version: 1.1.1n
8787

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

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
needs: check_source
168168
if: needs.check_source.outputs.run_tests == 'true'
169169
env:
170-
OPENSSL_VER: 1.1.1m
170+
OPENSSL_VER: 1.1.1n
171171
PYTHONSTRICTEXTENSIONBUILD: 1
172172
steps:
173173
- uses: actions/checkout@v2
@@ -226,7 +226,7 @@ jobs:
226226
strategy:
227227
fail-fast: false
228228
matrix:
229-
openssl_ver: [1.1.1m, 3.0.1]
229+
openssl_ver: [1.1.1n, 3.0.2]
230230
env:
231231
OPENSSL_VER: ${{ matrix.openssl_ver }}
232232
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -273,7 +273,7 @@ jobs:
273273
needs: check_source
274274
if: needs.check_source.outputs.run_tests == 'true'
275275
env:
276-
OPENSSL_VER: 1.1.1m
276+
OPENSSL_VER: 1.1.1n
277277
PYTHONSTRICTEXTENSIONBUILD: 1
278278
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
279279
steps:

‎Mac/BuildScript/build-installer.py‎

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

247247
result.extend([
248248
dict(
249-
name="OpenSSL 1.1.1m",
250-
url="https://www.openssl.org/source/openssl-1.1.1m.tar.gz",
251-
checksum='8ec70f665c145c3103f6e330f538a9db',
249+
name="OpenSSL 1.1.1n",
250+
url="https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
251+
checksum='2aad5635f9bb338bc2c6b7d19cbc9676',
252252
buildrecipe=build_universal_openssl,
253253
configure=None,
254254
install=None,

‎Misc/NEWS.d/next/Build/2022-03-15-09-28-55.bpo-47024.t7-dcu.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update OpenSSL to 1.1.1n for macOS installers and all Windows builds.

‎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.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1m
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n
5757
set libraries=%libraries% sqlite-3.38.1.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
7777

7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.2
80-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1m
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1n
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
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
@@ -67,8 +67,8 @@
6767
<libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
6868
<libffiOutDir>$(ExternalsDir)libffi-3.4.2\$(ArchName)\</libffiOutDir>
6969
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
70-
<opensslDir>$(ExternalsDir)openssl-1.1.1m\</opensslDir>
71-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1m\$(ArchName)\</opensslOutDir>
70+
<opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
71+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
7272
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
7373
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
7474
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

‎Tools/ssl/multissltests.py‎

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

4949
OPENSSL_RECENT_VERSIONS = [
50-
"1.1.1m",
51-
"3.0.1"
50+
"1.1.1n",
51+
"3.0.2"
5252
]
5353

5454
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL